Version 4.2.0

applications/core/modules/admin/discovery/streams.php

@@ -1,12 +1,11 @@
 <?php
 /**
  * @brief		streams
- * @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		01 Jul 2015
- * @version		SVN_VERSION_NUMBER
  */
 
 namespace IPS\core\modules\admin\discovery;
@@ -119,22 +118,23 @@ class _streams extends \IPS\Node\Controller
 		$types = array( 'register', 'follow_member', 'follow_content', 'photo' );
 		if ( \IPS\Settings::i()->reputation_enabled )
 		{
-			if ( \IPS\Settings::i()->reputation_point_types == 'like' )
+			$types[] = 'like';
+		}
+		if ( \IPS\Settings::i()->clubs )
+		{
+			$types[] = 'clubs';
+		}
+
+		/* Extensions */
+		foreach ( \IPS\Application::allExtensions( 'core', 'StreamItems', TRUE, 'core' ) as $key => $extension )
+		{
+			$extensionKey = mb_strtolower( $key );
+			$settingKey = "all_activity_{$extensionKey}";
+
+			/* Only add the option if a setting for it exists - the setting must be defined by the application the extension is for. */
+			if( isset( \IPS\Settings::i()->$settingKey ) )
 			{
-				$types[] = 'like';
-			}
-			elseif ( \IPS\Settings::i()->reputation_point_types == 'both' )
-			{
-				$types[] = 'like';
-				$types[] = 'rep_neg';
-			}
-			elseif ( \IPS\Settings::i()->reputation_point_types == 'positive' )
-			{
-				$types[] = 'like';
-			}
-			elseif ( \IPS\Settings::i()->reputation_point_types == 'negative' )
-			{
-				$types[] = 'rep_neg';
+				$types[] = mb_strtolower( $key );
 			}
 		}
 		
@@ -147,7 +147,7 @@ class _streams extends \IPS\Node\Controller
 			{
 				$currentValuesStream[] = $k;
 			}
-			$options[ $k ] = ( $k == 'like' and \IPS\Settings::i()->reputation_point_types != 'like' ) ? 'all_activity_rep_pos' : $key;
+			$options[ $k ] = ( $k == 'like' and !\IPS\Content\Reaction::isLikeMode() ) ? 'all_activity_react' : $key;
 		}
 		
 		$form = new \IPS\Helpers\Form;