Version 3.4.8

upload/admin/sources/base/core.php

@@ -2,12 +2,12 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
  * Static Classes for IP.Board 3
  *
  * These classes are not required as objects. We have grouped
  * together several singletons to prevent multiple file loads
- * Last Updated: $Date: 2013-09-26 22:37:28 -0400 (Thu, 26 Sep 2013) $
+ * Last Updated: $Date: 2014-12-31 17:46:06 -0500 (Wed, 31 Dec 2014) $
  * </pre>
  *
  * @author 		$Author: rashbrook $
@@ -16,7 +16,7 @@
  * @package		IP.Board
  * @link		http://www.invisionpower.com
  * @since		12th March 2002
- * @version		$Revision: 12370 $
+ * @version		$Revision: 12581 $
  *
  * @author	Matt
  */
@@ -1471,6 +1471,12 @@ class IPSLib
 			
 			$XMLVersions = IPSSetUp::fetchXmlAppVersions( $app );
 			$tmp         = $XMLVersions;
+			
+			if ( $tmp === FALSE )
+			{
+				$tmp = array( 0 => 0 );
+			}
+			
 			krsort( $tmp );
 
 			foreach( $tmp as $long => $human )
@@ -3460,6 +3466,22 @@ EOF;
 	 */
 	static public function hasActiveLicense( $allowPerpetual=true )
 	{
+		//return true;
+		$licenseData = ipsRegistry::cache()->getCache( 'licenseData' );
+
+		if ( ( ! $licenseData OR ! $licenseData['key']['_expires'] OR $licenseData['key']['_expires'] < IPS_UNIX_TIME_NOW OR $licenseData['key']['_expires'] == 9999999999 ) )
+		{
+			return false;
+		}
+		
+		if ( $allowPerpetual !== true )
+		{
+			if ( stristr( $licenseData['name'], 'perpetual' ) )
+			{
+				return false;
+			}
+		}
+		
 		return true;
 	}
 	
@@ -4188,7 +4210,7 @@ class IPSCookie
 	        	{
 	        		$_domain[] = $bit;
 	        		
-		        	if ( ! in_array( $bit, array( 'aero', 'asia', 'biz', 'cat', 'com', 'coop', 'edu', 'gov', 'info', 'int', 'jobs', 'mil', 'mobi', 'museum', 'name', 'net', 'org', 'pro', 'tel', 'travel', 'ac', 'ad', 'ae', 'af', 'ag', 'ai', 'al', 'am', 'an', 'ao', 'aq', 'ar', 'as', 'at', 'au', 'aw', 'ax', 'az', 'ba', 'bb', 'bd', 'be', 'bf', 'bg', 'bh', 'bi', 'bj', 'bl', 'bm', 'bn', 'bo', 'br', 'bs', 'bt', 'bv', 'bw', 'by', 'bz', 'ca', 'cc', 'cd', 'cf', 'cg', 'ch', 'ci', 'ck', 'cl', 'cm', 'cn', 'co', 'cr', 'cu', 'cv', 'cx', 'cy', 'cz', 'de', 'dj', 'dk', 'dm', 'do', 'dz', 'ec', 'ee', 'eg', 'eh', 'er', 'es', 'et', 'eu', 'fi', 'fj', 'fk', 'fm', 'fo', 'fr', 'ga', 'gb', 'gd', 'ge', 'gf', 'gg', 'gh', 'gi', 'gl', 'gm', 'gn', 'gp', 'gq', 'gr', 'gs', 'gt', 'gu', 'gw', 'gy', 'hk', 'hm', 'hn', 'hr', 'ht', 'hu', 'id', 'ie', 'il', 'im', 'in', 'io', 'iq', 'ir', 'is', 'it', 'je', 'jm', 'jo', 'jp', 'ke', 'kg', 'kh', 'ki', 'km', 'kn', 'kp', 'kr', 'kw', 'ky', 'kz', 'la', 'lb', 'lc', 'li', 'lk', 'lr', 'ls', 'lt', 'lu', 'lv', 'ly', 'ma', 'mc', 'md', 'me', 'mg', 'mh', 'mk', 'ml', 'mm', 'mn', 'mo', 'mp', 'mq', 'mr', 'ms', 'mt', 'mu', 'mv', 'mw', 'mx', 'my', 'mz', 'na', 'nc', 'ne', 'nf', 'ng', 'ni', 'nl', 'no', 'np', 'nr', 'nu', 'nz', 'om', 'pa', 'pe', 'pf', 'pg', 'ph', 'pk', 'pl', 'pm', 'pn', 'pr', 'ps', 'pt', 'pw', 'py', 'qa', 're', 'ro', 'rs', 'ru', 'rw', 'sa', 'sb', 'sc', 'sd', 'se', 'sg', 'sh', 'si', 'sj', 'sk', 'sl', 'sm', 'sn', 'so', 'sr', 'st', 'su', 'sv', 'sy', 'sz', 'tc', 'td', 'tf', 'tg', 'th', 'tj', 'tk', 'tl', 'tm', 'tn', 'to', 'tp', 'tr', 'tt', 'tv', 'tw', 'tz', 'ua', 'ug', 'uk', 'um', 'us', 'uy', 'uz', 'va', 'vc', 've', 'vg', 'vi', 'vn', 'vu', 'wf', 'ws', 'ye', 'yt', 'yu', 'za', 'zm', 'zw' ) ) )
+		        	if ( ! in_array( $bit, array( 'aero', 'asia', 'biz', 'cat', 'com', 'coop', 'edu', 'gov', 'info', 'int', 'jobs', 'mil', 'mobi', 'museum', 'name', 'net', 'org', 'pro', 'tel', 'travel', 'ac', 'ad', 'ae', 'af', 'ag', 'ai', 'al', 'am', 'an', 'ao', 'aq', 'ar', 'as', 'at', 'au', 'aw', 'ax', 'az', 'ba', 'bb', 'bd', 'be', 'bf', 'bg', 'bh', 'bi', 'bj', 'bl', 'bm', 'bn', 'bo', 'br', 'bs', 'bt', 'bv', 'bw', 'by', 'bz', 'ca', 'cc', 'cd', 'cf', 'cg', 'ch', 'ci', 'ck', 'cl', 'cm', 'cn', 'co', 'cr', 'cu', 'cv', 'cx', 'cy', 'cz', 'de', 'dj', 'dk', 'dm', 'do', 'dz', 'ec', 'ee', 'eg', 'eh', 'er', 'es', 'et', 'eu', 'fi', 'fj', 'fk', 'fm', 'fo', 'fr', 'ga', 'gb', 'gd', 'ge', 'gf', 'gg', 'gh', 'gi', 'gl', 'gm', 'gn', 'gp', 'gq', 'gr', 'gs', 'gt', 'gu', 'gw', 'gy', 'hk', 'hm', 'hn', 'hr', 'ht', 'hu', 'id', 'ie', 'il', 'im', 'in', 'io', 'iq', 'ir', 'is', 'it', 'je', 'jm', 'jo', 'jp', 'ke', 'kg', 'kh', 'ki', 'km', 'kn', 'kp', 'kr', 'kw', 'ky', 'kz', 'la', 'lb', 'lc', 'li', 'lk', 'lr', 'ls', 'lt', 'lu', 'lv', 'ly', 'ma', 'mc', 'md', 'me', 'mg', 'mh', 'mk', 'ml', 'mm', 'mn', 'mo', 'mp', 'mq', 'mr', 'ms', 'mt', 'mu', 'mv', 'mw', 'mx', 'my', 'mz', 'na', 'nc', 'ne', 'nf', 'ng', 'ni', 'nl', 'no', 'np', 'nr', 'nu', 'nz', 'om', 'pa', 'pe', 'pf', 'pg', 'ph', 'pk', 'pl', 'pm', 'pn', 'pr', 'ps', 'pt', 'pw', 'py', 'qa', 're', 'ro', 'rs', 'ru', 'rw', 'sa', 'sb', 'sc', 'sd', 'se', 'sg', 'sh', 'si', 'sj', 'sk', 'sl', 'sm', 'sn', 'so', 'sr', 'st', 'su', 'sv', 'sy', 'sz', 'tc', 'td', 'tf', 'tg', 'th', 'tj', 'tk', 'tl', 'tm', 'tn', 'to', 'tp', 'tr', 'tt', 'tv', 'tw', 'tz', 'ua', 'ug', 'uk', 'um', 'us', 'uy', 'uz', 'va', 'vc', 've', 'vg', 'vi', 'vn', 'vu', 'wf', 'ws', 'ye', 'yt', 'yu', 'za', 'zm', 'zw', 'community' ) ) )
 		        	{
 		        		break;
 		        	}
@@ -4212,7 +4234,7 @@ class IPSCookie
 				}
 				else
 				{
-					@setcookie( $_name, $value, $expires, $_path );
+					@setcookie( $_name, $value, $expires, $_path, $_domain );
 				}
 			}
 			else
@@ -4504,7 +4526,7 @@ class IPSText
 		$text = strip_tags($text);
 		
 		/* Remove specific hex characters (/,<,>,#) as it confuses redirect engine */
-		$text = preg_replace( '#%(2f|3c|3e|23)#i', '', $text );
+		$text = preg_replace( '#%(2f|3c|3e|23|22|27|5c)#i', '', $text );
 		
 		/* Preserve other %data */
 		$text = preg_replace('#%([a-fA-F0-9][a-fA-F0-9])#', '-xx-$1-xx-', $text);

upload/admin/sources/base/darkLAE.php

@@ -0,0 +1,172 @@
+<?php
+/**
+ * <pre>
+ * Invision Power Services / IPBmafia.Ru
+ * IP.Board v3.4.2 / darkLicenseActivationEmulator 1.1
+ * License emulator
+ * </pre>
+ *
+ * @author 		$Author: _Dark_ $
+ * @copyright	(c) 2012 IPBmafia.Ru
+ * @package		IP.Board
+ * @link		http://www.ipbmafia.ru
+ * @version		1.1
+ *
+ */
+class darkLAE {
+
+	public static $settings = array(
+		/*
+		 * if TRUE IP.Board copyright will be displayed in page footer
+		 * if FALSE IP.Board copyright will be hidden
+		 * если TRUE копирайт IP.Board будет отображен в футере страницы
+		 * если FALSE копирайт IP.Board будет скрыт
+		 */
+		'ipboard_copyright_showing' => TRUE,
+	);
+
+	private static $licenseKey = 'darkLAE 1.1 (_Dark_, IPBmafia.Ru)';
+
+	public static function activateLicense() { 
+		$response = array(
+			'result' => 'ok'
+		);
+		return json_encode($response);
+	}
+
+	public static function getLicenseKey() {
+		return self::$licenseKey;
+	}
+
+	public static function getLicenseData() {
+		return array(
+				'key' => array(
+					'_expires' => '9999999998',
+		            'status_icon' => 'medal.png',
+		            'status' => 'Ok',
+		            'name' => 'Master License Key',
+		            'msg' => 'Activated by darkLAE',
+		            'expires' => '9999999999'
+				),
+				'addons' => array(
+					array(
+						'expires' => '',
+						'_expires' => 0,
+						'status_icon' => 'accept.png',
+						'status' => 'Ok',
+						'name' => 'IP.Board',
+						'msg' => ''
+					),
+					array(
+						'expires' => '',
+						'_expires' => 0,
+						'status_icon' => 'accept.png',
+						'status' => 'Ok',
+						'name' => 'IP.Nexus',
+						'msg' => ''
+					),
+					array(
+						'expires' => '',
+						'_expires' => 0,
+						'status_icon' => 'accept.png',
+						'status' => 'Ok',
+						'name' => 'IP.Content',
+						'msg' => ''
+					),
+					array(
+						'expires' => '',
+						'_expires' => 0,
+						'status_icon' => 'accept.png',
+						'status' => 'Ok',
+						'name' => 'IP.Gallery',
+						'msg' => ''
+					),
+					array(
+						'expires' => '',
+						'_expires' => 0,
+						'status_icon' => 'accept.png',
+						'status' => 'Ok',
+						'name' => 'IP.Blog',
+						'msg' => ''
+					),
+					array(
+						'expires' => '',
+						'_expires' => 0,
+						'status_icon' => 'accept.png',
+						'status' => 'Ok',
+						'name' => 'IP.Downloads',
+						'msg' => ''
+					),
+					array(
+						'expires' => '',
+						'_expires' => 0,
+						'status_icon' => 'cross.png',
+						'status' => 'Inactive',
+						'name' => 'IP.Chat',
+						'msg' => "Unfortunately, you can't use IP.Chat with nulled version."
+					),
+					array(
+						'expires' => '',
+						'_expires' => 0,
+						'status_icon' => 'accept.png',
+						'status' => 'Ok',
+						'name' => 'Copyright Removal',
+						'msg' => 'If you want disable copyright edit file /admin/sources/base/darkLAE.php at line 20.'
+					)
+				),
+				'ipbMain' => array(
+					array(
+						'expires' => '',
+						'_expires' => 0,
+						'status_icon' => 'information.png',
+						'status' => 'Inactive',
+						'name' => 'Standard Support',
+						'msg' => "You can't get support from the IPS Client Area, but you can ask for help at <a href='http://www.ipbmafia.ru' target='_blank'>IPBmafia.Ru</a>"
+					),
+					array(
+						'expires' => '',
+						'_expires' => 0,
+						'status_icon' => 'information.png',
+						'status' => 'Inactive',
+						'name' => 'Download Access',
+						'msg' => "You can't download new versions from the IPS Client Area, but you can download nulled versions at <a href='http://www.ipbmafia.ru' target='_blank'>IPBmafia.Ru</a>"
+					),
+					array(
+						'expires' => '',
+						'_expires' => 0,
+						'status_icon' => 'cross.png',
+						'status' => 'Inactive',
+						'name' => 'Spam Monitoring Service',
+						'msg' => "Unfortunately, you can't use Spam Monitoring Service with nulled version."
+					),
+					array(
+						'expires' => '',
+						'_expires' => 0,
+						'status_icon' => 'cross.png',
+						'status' => 'Inactive',
+						'name' => 'Mobile Push Notifications',
+						'msg' => "Unfortunately, you can't use Mobile Push Notifications with nulled version."
+					),
+					array(
+						'expires' => '',
+						'_expires' => 0,
+						'status_icon' => 'accept.png',
+						'status' => 'Ok',
+						'name' => 'Visual Skin Editor',
+						'msg' => ''
+					)
+				),
+			    'skinGen' => 1,
+			    'iphoneNotifications' => 0,
+			    'cr' => (int) !self::$settings['ipboard_copyright_showing']
+			);
+	}
+
+	public static function getVisualSkinEditorJsonData() {
+		$json = <<<_Dark_
+			var IPS_SKIN_GEN_DATA = {"skinGroups":{"app_calendar":["App: Calendar",["app_calendar_td_selected","app_calendar_td_hover","app_calendar_td_blank","app_calendar_td_today"]],"app_gallery":["App: Gallery",["albumDetailTable_td"]],"global":["Global Styles",["body","a","content","desc","desclighter"]],"tables":["Table Content",["row1","row2","unread","unreadalt","tableheader","tableheader_a","ipb_table"]],"other":["Other Styles",["ipsbox","Bar Header","postblock","NoMessages","fieldsetSubmit","general_box","general_box_h3","ipsboxcontainer","maintitle","sideMenuActive","ipsVerticalTabbed_tabs_li","ipsVerticalTabbed_tabs_li_a","ipsVerticalTabbed_tabs_li_a_hover","ipsVerticalTabbed_tabs_li_active","ipsfilterbar_item","ipsfilterbar_active"]],"buttons":["Button Styles",["but_submit","but_submit_alt","but_topic","but_secondary"]],"header":["Header Elements",["registerLink","header","primarynav","primarynav_inactive","primarynav_active","searchbutton"]],"pagination":["Pagination",["paginationBackForward","paginationBackForwardHover","paginationBackActive"]],"sidebar":["Sidebar",["ipsSideBlock","ipsSideBlock_h3"]],"profiles":["Profile Page",["statusupdate"]],"app_blog":["App: Blog",["entry_header"]]},"colorizeGroups":{"base":["app_calendar_td_selected","app_calendar_td_hover","app_calendar_td_blank","app_calendar_td_today","albumDetailTable_td","body","content","row1","row2","unread","unreadalt","ipsbox","Bar Header","tableheader","tableheader_a","postblock","NoMessages","but_submit_alt","fieldsetSubmit","registerLink","header","primarynav","primarynav_inactive","primarynav_active","general_box","general_box_h3","ipsboxcontainer","maintitle","desc","desclighter","ipb_table","ipsVerticalTabbed_tabs_li","ipsVerticalTabbed_tabs_li_a","ipsVerticalTabbed_tabs_li_a_hover","ipsVerticalTabbed_tabs_li_active","ipsfilterbar_item","ipsfilterbar_active","but_secondary","paginationBackForward","ipsSideBlock","ipsSideBlock_h3","statusupdate","entry_header"],"text":["a"],"secondary":["but_submit","searchbutton","but_topic"],"tertiary":["sideMenuActive","paginationBackForwardHover","paginationBackActive"]},"classes":{"app_calendar_td_selected":["#calendar_table td.selected","Calendar Selected Cell","Used for selected cells in the monthly calendar",{"background":["#E2E9F0",""],"shadow":["#E2E9F0",""]}],"app_calendar_td_hover":["#calendar_table td.normal:hover","Calendar Cell Hover","Used for hovering over cells in the monthly calendar",{"background":["#EDF1F5",""]}],"app_calendar_td_blank":["#calendar_table td.blank","Calendar Blank Cell","Used for blank cells in the monthly calendar",{"background":["#dbe2e8",""],"border":["#dbe2e8",""]}],"app_calendar_td_today":["#calendar_table td.today","Calendar Today Cell","Used for todays cell in the monthly calendar",{"background":["#f1f6ec",""],"border":["#6f8f52",""],"color":["#6f8f52",""]}],"albumDetailTable_td":["#albumDetailTable td","Album Detail Table","Thick border for detail table",{"border":["#ebf0f3",""]}],"body":["html, body","Body","The page background",{"background":["#d8dde8",""],"color":["#5a5a5a",""]}],"a":["a","Links","Basic links",{"color":["#225985",""]}],"content":["#content","Main Content Area","The area that contains all page content",{"background":["#fff",""]}],"row1":[".row1, .post_block.row1","Table Row 1","Generic table row color 1",{"background":["#fff",""]}],"row2":[".row2, .post_block.row2","Table Row 2","Generic table row color 2",{"background":["#f1f6f9",""]}],"unread":[".unread","Unread Row","Unread row colour",{"background":["#f7fbfc",""]}],"unreadalt":[".unread .altrow, .unread.altrow","Unread Row (Alt)","Darker version of unread row, used to highlight certain table columns",{"background":["#E2E9F0",""]}],"ipsbox":[".ipsBox","Content Box","Used to wrap most content sections",{"background":["#ebf0f3",""]}],"Bar Header":[".bar","Bar Header","Used in post forms, etc",{"background":["#eff4f7",""]}],"tableheader":[".header","Table Header","Used for table headings",{"background":["#b6c7db",""],"color":["#1d3652",""]}],"tableheader_a":["body .ipb_table .header a,\tbody .topic_options a","Table Header Link","Used for links in table headings",{"color":["#1d3652",""]}],"postblock":[".post_block","Post Block","An individual post wrapper",{"background":["#fff",""],"border":["#D6E2EB",""]}],"NoMessages":[".no_messages","No Messages Box","Box for 'no data' type messages",{"background":["#f6f8fa",""],"border":false}],"but_submit":[".input_submit","Submit Button","The primary button that submits forms",{"background":["#212121",""],"border":["#5c5c5c",""],"color":["#fff",""],"boxshadow":["#5c5c5c"," inset 0 1px 0 0 "]}],"but_submit_alt":[".input_submit.alt","Alternate Submit Button","Secondary buttons for forms",{"background":["#e2e9f0",""],"border":["#dae2ea",""],"color":["#464646",""],"boxshadow":["#eff3f8"," inset 0 1px 0 0 "]}],"fieldsetSubmit":["body#ipboard_body fieldset.submit,body#ipboard_body p.submit","Submit\/Button Strip","Used in forms where the submit buttons
Line truncated
+_Dark_;
+		return $json;
+	}
+}
+?>

upload/admin/sources/base/index.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>

upload/admin/sources/base/ipsController.php

@@ -3,7 +3,7 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
  * Primary controller
  * Last Updated: $LastChangedDate: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
  * </pre>

upload/admin/sources/base/ipsMember.php

@@ -2,10 +2,10 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
  * Static Member Class for IP.Board 3
  *
- * Last Updated: $Date: 2013-10-16 19:11:24 -0400 (Wed, 16 Oct 2013) $
+ * Last Updated: $Date: 2015-01-06 14:58:47 -0500 (Tue, 06 Jan 2015) $
  * </pre>
  *
  * @author 		$Author: rashbrook $
@@ -14,7 +14,7 @@
  * @package		IP.Board
  * @link		http://www.invisionpower.com
  * @since		12th March 2002
- * @version		$Revision: 12381 $
+ * @version		$Revision: 12586 $
  *
  * @author	Matt
  */
@@ -99,6 +99,14 @@ class IPSMember
 	 * @var unknown_type
 	 */
 	static protected $_sigParser = null;
+
+	/**
+	 * Remove Member during merge.
+	 * @bool
+	 * @brief See ticket 874824 - When merging on an IPS Connect linked slave IPB, the login handler attempts to remove the second account on the master. In this instance, we shouldn't do that.
+	 *
+	 */
+	static public $_isMerging = false;
 	
 	/**
 	 * Member data array
@@ -262,7 +270,32 @@ class IPSMember
 	 */
 	static public function canReceiveMobileNotifications( $memberData=array() )
 	{
+		/* Mobile notifications are currently deprecated http://community.invisionpower.com/resources/bugs.html/_/ip-board/remove-push-notification-references-r40643 */
 		return false;
+		
+		/* INIT */
+		$memberData = ( is_array( $memberData ) && count( $memberData ) ) ? $memberData : ipsRegistry::member()->fetchMemberData();
+
+		/* Check to see if notifications are enabled */
+		if( ! ipsRegistry::$settings['iphone_notifications_enabled'] )
+		{
+			return false;
+		}
+		
+		/* Check to see if the user has permission to get notifications */
+		if( ipsRegistry::$settings['iphone_notifications_groups'] )
+		{
+			if( IPSMember::isInGroup( $memberData, explode( ',', ipsRegistry::$settings['iphone_notifications_groups'] ) ) )
+			{
+				return true;
+			}
+			else
+			{
+				return false;
+			}
+		}
+		
+		return true;
 	}
 	
 	/**
@@ -1062,7 +1095,7 @@ class IPSMember
 				case 'id':
 					if ( is_array( $member_key ) )
 					{
-						$multiple_ids = $member_key;
+						$multiple_ids = array_map( 'intval', $member_key );
 					}
 					else
 					{
@@ -1073,7 +1106,7 @@ class IPSMember
 				case 'fb_uid':
 					if ( is_array( $member_key ) )
 					{
-						$multiple_ids = $member_key;
+						$multiple_ids = array_map( 'intval', $member_key );
 					}
 					else
 					{
@@ -1089,7 +1122,7 @@ class IPSMember
 				case 'twitter_id':
 					if ( is_array( $member_key ) )
 					{
-						$multiple_ids = $member_key;
+						$multiple_ids = array_map( 'intval', $member_key );
 					}
 					else
 					{
@@ -1149,7 +1182,7 @@ class IPSMember
 				case 'ipsconnect':
 					if ( is_array( $member_key ) )
 					{
-						$multiple_ids = $member_key;
+						$multiple_ids = array_map( 'intval', $member_key );
 					}
 					else
 					{
@@ -3782,14 +3815,15 @@ class IPSMember
 	 */
 	static public function canGiveRep( $data, $memberData )
 	{
-		$reppedArray	= unserialize( $data['rep_like_cache'] );
+		$reppedArray	= unserialize( $data['rep_like_cache'] );
+		
 		if( is_array( $reppedArray ) )
 		{
 			$repped = $reppedArray['cache_data']['memberIds'];
 			
 			if ( is_array( $repped ) )
 			{
-				if( in_array( ipsRegistry::member()->getProperty('member_id'), $repped ) )
+				if( in_array( ipsRegistry::member()->getProperty('member_id'), $repped ) AND ipsRegistry::$settings['reputation_point_types'] != 'like' )
 				{
 					return false;
 				}
@@ -4035,9 +4069,54 @@ class IPSMember
 	 */
 	static public function querySpamService( $email, $ip='', $type='register', $test=0 )
 	{
-		return 0;
-	}
+		/* Get the response */
+		$key		= trim( ipsRegistry::$settings['ipb_reg_number'] );
+		
+		if( !$key )
+		{
+			return 0;
+		}
 
+		$domain 	= ipsRegistry::$settings['board_url'];
+		$ip			= ( $ip AND ip2long( $ip ) ) ? $ip : ipsRegistry::member()->ip_address;
+		$response	= false;
+		$testConn	= $test ? '&debug_mode=1' : '';
+		
+		/* Get the file managemnet class */
+		$classToLoad = IPSLib::loadLibrary( IPS_KERNEL_PATH . 'classFileManagement.php', 'classFileManagement' );
+		$query = new $classToLoad();
+		$query->timeout = ipsRegistry::$settings['spam_service_timeout'];
+		
+		/* Query the service */
+		$response = $query->postFileContents( "https://remoteservices.invisionpower.com/spam/{$type}", array( 'email' => $email, 'ip' => $ip ), $key, $key );
+
+		if( ! $response )
+		{
+			return 'timeout';
+		}
+
+		/* Make sure the response is valid */
+		$responseCode = $query->http_status_code == 200 ? (int) $response : 0;
+		$responseMsg = $query->http_status_code == 200 ? '' : $response;
+		
+		if( $test )
+		{
+			return $responseMsg;
+		}
+
+		/* Log Request */
+		if( $type == 'register' )
+		{
+			ipsRegistry::DB()->insert( 'spam_service_log', array( 'log_date'		=> time(),
+																  'log_code'		=> $responseCode,
+																  'log_msg'		    => $responseMsg,
+																  'email_address'	=> $email,
+																  'ip_address'	    => $ip ) );
+		}
+
+		return $responseCode;
+	}
+	
 	/**
 	 * Check if a member's posts need to be approved
 	 * Note that this only takes into the global mod queue status, individual forums, etc. may
@@ -4337,6 +4416,15 @@ class IPSMember
 			self::resetLastRegisteredMember();
 		}
 		
+		//-----------------------------------------
+		// Let IPS know
+		//-----------------------------------------
+		
+		if( ipsRegistry::$settings['spam_service_send_to_ips'] )
+		{
+			self::querySpamService( $member['email'], $member['ip_address'], 'markspam' );
+		}
+		
 		//-----------------------------------------
 		// Log
 		//-----------------------------------------

upload/admin/sources/base/ipsMobileApp.php

@@ -3,7 +3,7 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
  * Mobile app methods
  * Last Updated: $LastChangedDate: 2012-05-21 07:52:30 -0400 (Mon, 21 May 2012) $
  * </pre>

upload/admin/sources/base/ipsRegistry.php

@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
  * ipsRegistry:: Registry file controlls handling of objects needed throughout IPB
- * Last Updated: $Date: 2013-10-16 12:57:41 -0400 (Wed, 16 Oct 2013) $
+ * Last Updated: $Date: 2015-03-09 15:48:19 -0400 (Mon, 09 Mar 2015) $
  * </pre>
  *
- * @author 		$Author: AndyMillne $
+ * @author 		$Author: 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		Tue. 17th August 2004
- * @version		$Rev: 12380 $
+ * @version		$Rev: 12609 $
  */
  
 /**
@@ -521,6 +521,11 @@ class ipsRegistry
 				{
 					$_POST[ $key ] = IPSText::stripslashes( $value );
 				}
+				
+				if ( $key === 'search_app' )
+				{
+					$_POST[ $key ] = IPSText::htmlspecialchars( $value );
+				}
 			}
 		}
 		
@@ -650,6 +655,13 @@ class ipsRegistry
 		
 		/* Post member processing */
 		self::$handles['member']->postOutput();
+
+		/* Check for security issue */
+		if ( !empty( $_GET['setlanguage'] ) AND $_GET['langid'] AND ipsRegistry::$request['k'] )
+		{
+			$url = preg_replace( "/k=(.+?){32}&/", "", ( strtolower($_SERVER['HTTPS']) == 'on' ? "https://" : "http://" ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
+			self::instance()->getClass('output')->silentRedirect( $url );
+		}
 		
 		/* Add SEO templates to the output system */
 		self::instance()->getClass('output')->seoTemplates = self::$_seoTemplates;
@@ -747,7 +759,7 @@ class ipsRegistry
 			self::$handles['member']->finalizePublicMember();
 			
 			/* Proper no cache key <update:1> */
-			ipsRegistry::$settings['noCacheKey'] = md5('$Rev: 12380 $');
+			ipsRegistry::$settings['noCacheKey'] = md5('$Rev: 12609 $');
 
 			/* Are we banned: Via IP Address? */
 			if ( IPSMember::isBanned( 'ipAddress', self::$handles['member']->ip_address ) === TRUE )
@@ -1534,7 +1546,7 @@ class ipsRegistry
 								if ( self::$_seoTemplates['__data__']['varBlock'] != '/page__' && $uri && strstr( $uri, '/page__' ) )
 								{
 									preg_match( '#(.*)(page__.*)$#', $uri, $matches );
-										
+								
 									$url      = $matches[1];
 									$query    = $matches[2];
 									$newQuery = '?';
@@ -1545,7 +1557,7 @@ class ipsRegistry
 									{
 										$newQuery .= ( $i % 2 == 0 ? '&' : '=' ) . $data[$i];
 									}
-								
+									
 									/* Class output not created here */
 									header( "HTTP/1.1 301 Moved Permanently" );
 									header( "Location: " . $_t['scheme'] . '://' . $_t['host'] . $url . $newQuery );
@@ -1554,6 +1566,7 @@ class ipsRegistry
 							}
 						}
 						
+						
 						if ( is_array( $data['in']['matches'] ) )
 						{
 							foreach( $data['in']['matches'] as $_replace )
@@ -1717,6 +1730,8 @@ class ipsRegistry
 									
 									if ( $_k and $_v )
 									{
+										$_v = IPSText::parseCleanValue( $_v );
+
 										$_GET[ $_k ]     = $_v;
 										$_REQUEST[ $_k ] = $_v;
 										$_urlBits[ $_k ] = $_v;
@@ -2205,7 +2220,7 @@ class ipsRegistry
 
 		# Facebook receiver location
 		ipsRegistry::$settings['fbc_xdlocation'] = ipsRegistry::$settings['_original_base_url'] . '/interface/facebook/xd_receiver.php';
-		ipsRegistry::$settings['fb_req_perms']   = 'email,publish_stream,read_stream';
+		ipsRegistry::$settings['fb_req_perms']   = 'email,publish_actions,user_status';
 		ipsRegistry::$settings['fb_locale']      = ( ipsRegistry::$settings['fb_locale'] ) ? ipsRegistry::$settings['fb_locale'] : 'en_US';
 		
 		# If we can't write to our /cache/tmp directory, turn off minify., It would still work, but be horribly inefficient.

upload/admin/sources/classes/admin/bookmarks.php

@@ -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>

upload/admin/sources/classes/ads.php

@@ -2,7 +2,7 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
  * Advertisements
  * </pre>
  *

upload/admin/sources/classes/archive/index.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>

upload/admin/sources/classes/archive/reader.php

@@ -2,7 +2,7 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
  * Archive: Reader
  * By Matt Mecham
  * </pre>

upload/admin/sources/classes/archive/reader/index.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>

upload/admin/sources/classes/archive/reader/sql.php

@@ -2,7 +2,7 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
  * Archive: Writer
  * By Matt Mecham
  * </pre>

upload/admin/sources/classes/archive/restore.php

@@ -2,7 +2,7 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
  * Archive: Reader
  * By Matt Mecham
  * </pre>

upload/admin/sources/classes/archive/restore/index.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>

upload/admin/sources/classes/archive/restore/sql.php

@@ -2,7 +2,7 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
  * Archive: Restore
  * By Matt Mecham
  * </pre>

upload/admin/sources/classes/archive/writer.php

@@ -2,7 +2,7 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
  * Archive: Writer
  * By Matt Mecham
  * </pre>

upload/admin/sources/classes/archive/writer/index.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>

upload/admin/sources/classes/archive/writer/sql.php

@@ -2,7 +2,7 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
  * Archive: Writer
  * By Matt Mecham
  * </pre>

upload/admin/sources/classes/backup.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>
@@ -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';
 	}
 	
 	/**

upload/admin/sources/classes/backup/db.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>

upload/admin/sources/classes/bbcode/core.php

@@ -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
 		//-----------------------------------------

upload/admin/sources/classes/bbcode/custom/ccs.php

@@ -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>

upload/admin/sources/classes/bbcode/custom/defaults.php

@@ -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>

upload/admin/sources/classes/bbcode/custom/index.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>

upload/admin/sources/classes/bbcode/index.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>

upload/admin/sources/classes/bbcode/legacy.php

@@ -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>

upload/admin/sources/classes/cache/index.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>

upload/admin/sources/classes/cache/simple.php

@@ -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>

upload/admin/sources/classes/class_admin_functions.php

@@ -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>

upload/admin/sources/classes/class_localization.php

@@ -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.

upload/admin/sources/classes/class_permissions.php

@@ -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>

upload/admin/sources/classes/class_public_permissions.php

@@ -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>

upload/admin/sources/classes/class_reputation_cache.php

@@ -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' ) );

upload/admin/sources/classes/class_taskmanager.php

@@ -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>

upload/admin/sources/classes/comments/index.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>

upload/admin/sources/classes/customfields/index.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>

upload/admin/sources/classes/editor/class_editor.php

@@ -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>

upload/admin/sources/classes/editor/class_editor_rte.php

@@ -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>

upload/admin/sources/classes/editor/class_editor_std.php

@@ -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>

upload/admin/sources/classes/editor/composite.php

@@ -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*' ) );
 		}

upload/admin/sources/classes/editor/index.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>

upload/admin/sources/classes/facebook/index.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>

upload/admin/sources/classes/incomingEmail/incomingEmail.php

@@ -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++;

upload/admin/sources/classes/index.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>

upload/admin/sources/classes/itemmarking/classItemMarking.php

@@ -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) $

upload/admin/sources/classes/itemmarking/index.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>

upload/admin/sources/classes/like/composite.php

@@ -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 ) )

upload/admin/sources/classes/like/index.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>

upload/admin/sources/classes/mapping/bootstrap.php

@@ -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) $

upload/admin/sources/classes/mapping/engines/bing.php

@@ -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) $

upload/admin/sources/classes/mapping/engines/google.php

@@ -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) $

upload/admin/sources/classes/mapping/engines/index.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>

upload/admin/sources/classes/mapping/index.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>

upload/admin/sources/classes/member/index.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>

upload/admin/sources/classes/member/memberFunctions.php

@@ -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) $

upload/admin/sources/classes/member/notifications.php

@@ -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();

upload/admin/sources/classes/mobile/index.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>

upload/admin/sources/classes/mobile/iosImages.php

@@ -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) $

upload/admin/sources/classes/navigation/build.php

@@ -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) $

upload/admin/sources/classes/navigation/index.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>

upload/admin/sources/classes/output/adminOutput.php

@@ -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();

upload/admin/sources/classes/output/formats/coreOutput.php

@@ -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) $

upload/admin/sources/classes/output/formats/html/conf.php

@@ -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) $

upload/admin/sources/classes/output/formats/html/htmlOutput.php

@@ -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'] )
         	{

upload/admin/sources/classes/output/formats/html/index.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>

upload/admin/sources/classes/output/formats/index.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>

upload/admin/sources/classes/output/formats/xml/conf.php

@@ -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) $

upload/admin/sources/classes/output/formats/xml/index.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>

upload/admin/sources/classes/output/formats/xml/xmlOutput.php

@@ -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'] )

upload/admin/sources/classes/output/index.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>

upload/admin/sources/classes/output/publicOutput.php

@@ -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
     	//-----------------------------------------

upload/admin/sources/classes/output/systemTemplates.php

@@ -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>

upload/admin/sources/classes/rss/import.php

@@ -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) $

upload/admin/sources/classes/rss/index.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>

upload/admin/sources/classes/sabre/directory/groups.php

@@ -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>

upload/admin/sources/classes/sabre/directory/index.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>

upload/admin/sources/classes/sabre/directory/templates.php

@@ -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>

upload/admin/sources/classes/sabre/files/index.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>

upload/admin/sources/classes/sabre/files/templates.php

@@ -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>

upload/admin/sources/classes/sabre/index.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>

upload/admin/sources/classes/sabre/lock/index.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>

upload/admin/sources/classes/sabre/lock/nolocks.php

@@ -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>

upload/admin/sources/classes/sabre/root/index.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>

upload/admin/sources/classes/sabre/root/skins.php

@@ -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>

upload/admin/sources/classes/search/controller.php

@@ -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>

upload/admin/sources/classes/search/engines/index.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>

upload/admin/sources/classes/search/engines/sphinx.php

@@ -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>

upload/admin/sources/classes/search/engines/sql.php

@@ -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 );
 	}

upload/admin/sources/classes/search/format.php

@@ -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>

upload/admin/sources/classes/search/index.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>

upload/admin/sources/classes/session/adminSessions.php

@@ -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>

upload/admin/sources/classes/session/api.php

@@ -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 $
  */
 

upload/admin/sources/classes/session/index.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>

upload/admin/sources/classes/session/publicSessions.php

@@ -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 $
  *
  */
 

upload/admin/sources/classes/session/sso.rename.php

@@ -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>

upload/admin/sources/classes/session/ssoMobileAppLogIn.rename.php

@@ -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>

upload/admin/sources/classes/share/index.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>