Version 3.4.8

2025-12-19 00:42:42 -08:00
1 parent b45ea0dffb
commit c603205a25
@@ -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
 * Member form manipulation
 * Last Updated: $Date: 2012-08-22 10:47:20 -0400 (Wed, 22 Aug 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
 * IP.Board messenger attachments plugin
 * Last Updated: $Date: 2013-04-25 15:26:40 -0400 (Thu, 25 Apr 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>
@@ -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
 * Core extensions
 * Last Updated: $Date: 2012-05-21 09:09:36 -0400 (Mon, 21 May 2012) $
 * </pre>
@@ -149,7 +149,7 @@ class publicSessions__members
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Item Marking
 * Last Updated: $Date: 2012-05-21 09:09:36 -0400 (Mon, 21 May 2012) $
 * </pre>
@@ -2,7 +2,7 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Core variables extension file
 * 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
 * Dashboard Notifications
 * Last Updated: $Date
 *
@@ -2,7 +2,7 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Define data hook locations (Members)
 * 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
 * BBCode Management : Determines if bbcode can be used in this section
 * Last Updated: $LastChangedDate: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
 * </pre>
@@ -7,7 +7,7 @@
 * $Author: mark $
 * @since		24 July 2012
 * $LastChangedDate: 2012-06-20 10:50:23 +0100 (Wed, 20 Jun 2012) $
- * @version		v3.4.6
+ * @version		v3.4.8
 * $Revision: 10952 $
 */

@@ -102,7 +102,7 @@ class enhancements_members_mandrill
 		/* Fire that off to IPS so Mandrill knows it's one of ours */
 		$classToLoad = IPSLib::loadLibrary( IPS_KERNEL_PATH . 'classFileManagement.php', 'classFileManagement' );
 		$file = new $classToLoad();
-		$json = $file->getFileContents( 'http://license.invisionpower.com/mandrill/?key='.urlencode( ipsRegistry::$request['api_key'] ) . '&username=' . urlencode( ipsRegistry::$request['username'] ) . '&lkey=' . urldecode( ipsRegistry::$settings['ipb_reg_number'] ) . '&version=' . IPB_LONG_VERSION );
+		$json = NULL;
 		
 		/* If they want to use Mandrill for SMTP too, that call will contain the SMTP info,
 		   so set it if we got it, or if the call failed, throw an error */
@@ -7,7 +7,7 @@
 * $Author: mark $
 * @since		24 July 2012
 * $LastChangedDate: 2012-06-20 10:50:23 +0100 (Wed, 20 Jun 2012) $
- * @version		v3.4.6
+ * @version		v3.4.8
 * $Revision: 10952 $
 */

@@ -32,7 +32,7 @@ class enhancements_members_spammonitoring
 	{
 		$this->title = $registry->getClass('class_localization')->words['enhancements_spammonitoring'];
 		$this->description = $registry->getClass('class_localization')->words['enhancements_spammonitoring_desc'];
-		$this->message = "<a href='http://anonym.to/?http://external.ipslink.com/ipboard30/landing/?p=spamserviceinfo' target='_blank'>{$registry->getClass('class_localization')->words['enhancements_spammonitoring_help']}</a>";
+		$this->message = "<a href='http://external.ipslink.com/ipboard30/landing/?p=spamserviceinfo' target='_blank'>{$registry->getClass('class_localization')->words['enhancements_spammonitoring_help']}</a>";
 		$this->enabled = ( ipsRegistry::$settings['spam_service_enabled'] and $this->check( TRUE ) );
 	}
 	
@@ -3,7 +3,7 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * RSS output plugin :: posts
 * 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
 * Sets up SEO templates
 * Last Updated: $Date: 2013-02-04 18:48:34 -0500 (Mon, 04 Feb 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>
@@ -3,7 +3,7 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Forum permissions mappings
 * Last Updated: $Date: 2012-08-22 10:11:25 -0400 (Wed, 22 Aug 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>
@@ -7,7 +7,7 @@
 * $Author: mmecham $
 * @since		2/17/2011
 * $LastChangedDate: 2012-01-24 11:56:40 -0500 (Tue, 24 Jan 2012) $
- * @version		v3.4.6
+ * @version		v3.4.8
 * $Revision: 10180 $
 */

@@ -7,7 +7,7 @@
 * $Author: mark $
 * @since		2/18/2011
 * $LastChangedDate: 2012-03-23 08:34:13 -0400 (Fri, 23 Mar 2012) $
- * @version		v3.4.6
+ * @version		v3.4.8
 * $Revision: 10474 $
 */

@@ -7,7 +7,7 @@
 * $Author: mark $
 * @since		2/17/2011
 * $LastChangedDate: 2011-11-16 11:36:38 -0500 (Wed, 16 Nov 2011) $
- * @version		v3.4.6
+ * @version		v3.4.8
 * $Revision: 9829 $
 */

@@ -7,7 +7,7 @@
 * $Author: mark $
 * @since		2/17/2011
 * $LastChangedDate: 2011-11-16 11:36:38 -0500 (Wed, 16 Nov 2011) $
- * @version		v3.4.6
+ * @version		v3.4.8
 * $Revision: 9829 $
 */

@@ -7,7 +7,7 @@
 * $Author: mark $
 * @since		2/17/2011
 * $LastChangedDate: 2011-11-16 11:36:38 -0500 (Wed, 16 Nov 2011) $
- * @version		v3.4.6
+ * @version		v3.4.8
 * $Revision: 9829 $
 */

@@ -7,7 +7,7 @@
 * $Author: ips_terabyte $
 * @since		2/14/2011
 * $LastChangedDate: 2011-12-14 12:27:41 -0500 (Wed, 14 Dec 2011) $
- * @version		v3.4.6
+ * @version		v3.4.8
 * $Revision: 10000 $
 */

@@ -3,7 +3,7 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Define the core notification types
 * Last Updated: $Date: 2013-05-21 20:51:17 -0400 (Tue, 21 May 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>
@@ -2,7 +2,7 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Fetches meta data for notifications
 * 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
 * Config for about me tab
 * 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
 * Profile Plugin Library
 * Last Updated: $Date: 2012-09-14 10:11:40 -0400 (Fri, 14 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>
@@ -2,7 +2,7 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Config for reputation tab
 * 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
 * Reputation Profile Tab
 * Last Updated: $Date: 2012-09-27 11:58:26 -0400 (Thu, 27 Sep 2012) $
 * </pre>
@@ -2,7 +2,7 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Config for about me tab
 * 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
 * Profile Plugin Library
 * Last Updated: $Date: 2012-08-28 17:56:22 -0400 (Tue, 28 Aug 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
 * Report Center :: Private Messages plugin
 * Last Updated: $LastChangedDate: 2013-05-08 17:43:20 -0400 (Wed, 08 May 2013) $
 * </pre>
@@ -2,7 +2,7 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Report Center :: Profiles plugin
 * Last Updated: $LastChangedDate: 2013-04-12 20:11:40 -0400 (Fri, 12 Apr 2013) $
 * </pre>
@@ -2,7 +2,7 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Config file
 * Last Updated: $Date: 2013-04-15 17:26:30 -0400 (Mon, 15 Apr 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>
@@ -2,18 +2,18 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Basic Forum Search
- * Last Updated: $Date: 2013-02-25 18:03:27 -0500 (Mon, 25 Feb 2013) $
+ * Last Updated: $Date: 2014-11-11 15:53:26 -0500 (Tue, 11 Nov 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	Forums
 * @link		http://www.invisionpower.com
- * @version		$Rev: 12024 $
+ * @version		$Rev: 12568 $
 */

 if ( ! defined( 'IN_IPB' ) )
@@ -225,13 +225,27 @@ class search_engine_members extends search_engine
 			break;
 		}
 		
+		$joins = array();
+		$joins[] = array(
+			'from'	=> array( 'profile_portal' => 'p' ),
+			'where'	=> "p.pp_member_id=m.member_id",
+			'type'	=> 'left',
+		);
+		
+		if ( ! $this->memberData['g_access_cp'] )
+		{
+			$joins[] = array(
+				'from'	=> array( 'groups' => 'g' ),
+				'where'	=> "g.g_id = m.member_group_id",
+				'type'	=> 'left',
+			);
+		}
+		
 		/* Query the count */	
 		$count = $this->DB->buildAndFetch( array('select'   => 'COUNT(*) as total_results',
 												 'from'	    => array( 'members' => 'm' ),
 				 								 'where'	=> $this->_buildWhereStatement( $search_term ),
-												 'add_join' => array( array( 'from'   => array( 'profile_portal' => 'p' ),
-																			'where'  => "p.pp_member_id=m.member_id",
-																			'type'   => 'left' ) ) ) );
+												 'add_join' => $joins ) );
 		
 		
 		
@@ -241,10 +255,7 @@ class search_engine_members extends search_engine
 								'where'	   => $this->_buildWhereStatement( $search_term ),
 								'order'    => $sortKey . ' ' . $sort_order,
 								'limit'    => array( IPSSearchRegistry::get('in.start'), IPSSearchRegistry::get('opt.search_per_page') ),
-								'add_join' => array( array( 'select' => 'p.*',
-															'from'   => array( 'profile_portal' => 'p' ),
-															'where'  => "p.pp_member_id=m.member_id",
-															'type'   => 'left' ) ) ) );
+								'add_join' => $joins ) );
 		$this->DB->execute();

 		/* Get results */
@@ -487,6 +498,11 @@ class search_engine_members extends search_engine
 				$where_clause[] = "m.joined < {$this->search_end_timestamp}";
 			}
 		}
+		
+		if ( ! $this->memberData['g_access_cp'] )
+		{
+			$where_clause[] = "g.g_hide_from_list = 0";
+		}
 			
 		/* Build and return the string */
 		return implode( " AND ", $where_clause );
@@ -2,7 +2,7 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Returns HTML for the form (optional class, not required)
 * 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
 * Formats forum search results
 * Last Updated: $Date: 2012-05-25 13:17:47 -0400 (Fri, 25 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
 * Sphinx template file
 * Last Updated: $Date: 2011-06-02 17:57:20 -0400 (Thu, 02 Jun 2011) $
 * </pre>
@@ -7,7 +7,7 @@
 * $Author: ips_terabyte $ (Original: Mark)
 * @since		-
 * $LastChangedDate: 2010-10-14 13:11:17 -0400 (Thu, 14 Oct 2010) $
- * @version		v3.4.6
+ * @version		v3.4.8
 * $Revision: 477 $
 */