Version 4.2.0

system/Content/Search/Mysql/Query.php

@@ -1,12 +1,11 @@
 <?php
 /**
  * @brief		MySQL Search Query
- * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Community Suite
+ * @author		<a href='https://www.invisioncommunity.com'>Invision Power Services, Inc.</a>
+ * @copyright	(c) Invision Power Services, Inc.
+ * @license		https://www.invisioncommunity.com/legal/standards/
+ * @package		Invision Community
  * @since		21 Aug 2014
- * @version		SVN_VERSION_NUMBER
 */
 
 namespace IPS\Content\Search\Mysql;
@@ -128,6 +127,12 @@ class _Query extends \IPS\Content\Search\Query
 					$clause[] = \IPS\Db::i()->in( 'index_container_id', $unsearchableIds, TRUE );
 				}	
 			}
+
+			/* Are we excluding certain container classes? */
+			if( $filter->containerClasses !== NULL )
+			{
+				$clause[] = \IPS\Db::i()->in( 'index_container_class', $filter->containerClasses );
+			}
 			
 			/* Set the item IDs */
 			if ( $filter->itemIdFilter !== NULL )
@@ -209,7 +214,32 @@ class _Query extends \IPS\Content\Search\Query
 		}
 		 
 		return $this;
-	}	
+	}
+	
+	
+	/**
+	 * Filter by club
+	 *
+	 * @param	\IPS\Member\Club|int|array|null	$club	The club, or array of club IDs, or NULL to exclude content from clubs
+	 * @return	\IPS\Content\Search\Query	(for daisy chaining)
+	 */
+	public function filterByClub( $club )
+	{
+		if ( $club === NULL )
+		{
+			$this->where[] = 'index_club_id IS NULL';
+		}
+		if ( is_array( $club ) )
+		{
+			$this->where[] = array( \IPS\Db::i()->in( 'index_club_id', $club ) );
+		}
+		else
+		{
+			$this->where[] = array( 'index_club_id=?', $club instanceof \IPS\Member\Club ? $club->id : $club );
+		}
+		
+		return $this;
+	}
 	
 	/**
 	 * Filter for profile
@@ -253,6 +283,37 @@ class _Query extends \IPS\Content\Search\Query
 		 
 		return $this;
 	}
+
+	/**
+	 * Filter by container class
+	 *
+	 * @param	array	$classes	Container classes to exclude from results.
+	 * @param	array	$exclude	Content classes to exclude from the filter. For cases where multiple content classes may have the same container class
+	 * 								such as Gallery images, comments and reviews.
+	 * @return	\IPS\Content\Search\Query	(for daisy chaining)
+	 */
+	public function filterByContainerClasses( $classes=array(), $exclude=array() )
+	{
+		if( empty( $exclude ) )
+		{
+			$this->where[] = \IPS\Db::i()->in( 'index_container_class', $classes, TRUE );
+		}
+		else
+		{
+			foreach( $classes as $i => $class )
+			{
+				$classes[$i] = "'" . \IPS\DB::i()->real_escape_string( $class ) . "'";
+			}
+			foreach( $exclude as $i => $class )
+			{
+				$exclude[$i] = "'" . \IPS\DB::i()->real_escape_string( $class ) . "'";
+			}
+
+			$this->where[] = '( index_container_class NOT IN(' . implode( ',', $classes ) . ') OR index_class IN(' . implode( ',', $exclude ) . ') )';
+		}
+		 
+		return $this;
+	}
 	
 	/**
 	 * Filter by content the user follows