Version 4.5.0

applications/forums/extensions/core/AdvertisementLocations/ForumListing.php

@@ -12,7 +12,7 @@
 namespace IPS\forums\extensions\core\AdvertisementLocations;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
 {
 	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
 	exit;

applications/forums/extensions/core/AdvertisementLocations/IndexView.php

@@ -12,7 +12,7 @@
 namespace IPS\forums\extensions\core\AdvertisementLocations;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
 {
 	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
 	exit;

applications/forums/extensions/core/AdvertisementLocations/TopicView.php

@@ -12,7 +12,7 @@
 namespace IPS\forums\extensions\core\AdvertisementLocations;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
 {
 	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
 	exit;

applications/forums/extensions/core/Announcements/Forums.php

@@ -12,7 +12,7 @@
 namespace IPS\forums\extensions\core\Announcements;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
 {
 	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
 	exit;

applications/forums/extensions/core/BBCode/post.php

@@ -12,7 +12,7 @@
 namespace IPS\forums\extensions\core\BBCode;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
 {
 	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
 	exit;
@@ -60,7 +60,7 @@ class _post
 			{
 				try
 				{
-					$node->setAttribute( 'href', (string) \IPS\forums\Topic\Post::load( intval( $matches[2] ) )->url() );
+					$node->setAttribute( 'href', (string) \IPS\forums\Topic\Post::load( \intval( $matches[2] ) )->url() );
 				}
 				catch ( \Exception $e ) {}
 				

applications/forums/extensions/core/BBCode/snapback.php

@@ -12,7 +12,7 @@
 namespace IPS\forums\extensions\core\BBCode;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
 {
 	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
 	exit;
@@ -60,7 +60,7 @@ class _snapback
 			{
 				try
 				{
-					$node->setAttribute( 'href', (string) \IPS\forums\Topic\Post::load( intval( $matches[2] ) )->url() );
+					$node->setAttribute( 'href', (string) \IPS\forums\Topic\Post::load( \intval( $matches[2] ) )->url() );
 					$node->appendChild( $document->createEntityReference( 'larr' ) );
 				}
 				catch ( \Exception $e ) {}

applications/forums/extensions/core/BBCode/topic.php

@@ -12,7 +12,7 @@
 namespace IPS\forums\extensions\core\BBCode;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
 {
 	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
 	exit;
@@ -60,7 +60,7 @@ class _topic
 			{
 				try
 				{
-					$node->setAttribute( 'href', (string) \IPS\forums\Topic::load( intval( $matches[2] ) )->url() );
+					$node->setAttribute( 'href', (string) \IPS\forums\Topic::load( \intval( $matches[2] ) )->url() );
 				}
 				catch ( \Exception $e ) {}
 				

applications/forums/extensions/core/ContentModeratorPermissions/Topics.php

@@ -12,7 +12,7 @@
 namespace IPS\forums\extensions\core\ContentModeratorPermissions;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
 {
 	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
 	exit;
@@ -45,7 +45,7 @@ class _Topics
 	{
 		$return = array();
 		
-		if ( \IPS\Db::i()->select( 'COUNT(*)', 'forums_forums', 'can_view_others=0' )->first() )
+		if ( \IPS\Db::i()->select( 'COUNT(*)', 'forums_forums', 'can_view_others=0 AND club_id IS NULL' )->first() )
 		{
 			$return['can_read_all_topics'] = 'YesNo';
 		}
@@ -101,7 +101,7 @@ class _Topics
 	 */
 	public function reindexAuthorOnlyForums( $deleteFirst )
 	{
-		foreach ( new \IPS\Patterns\ActiveRecordIterator( \IPS\Db::i()->select( '*', 'forums_forums', 'can_view_others=0' ), 'IPS\forums\Forum' ) as $forum )
+		foreach ( new \IPS\Patterns\ActiveRecordIterator( \IPS\Db::i()->select( '*', 'forums_forums', 'can_view_others=0 AND club_id IS NULL' ), 'IPS\forums\Forum' ) as $forum )
 		{
 			if ( $deleteFirst )
 			{

applications/forums/extensions/core/ContentRouter/Topics.php

@@ -12,7 +12,7 @@
 namespace IPS\forums\extensions\core\ContentRouter;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
 {
 	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
 	exit;

applications/forums/extensions/core/CreateMenu/Topic.php

@@ -12,7 +12,7 @@
 namespace IPS\forums\extensions\core\CreateMenu;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
 {
 	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
 	exit;

applications/forums/extensions/core/EditorLocations/Forums.php

@@ -12,7 +12,7 @@
 namespace IPS\forums\extensions\core\EditorLocations;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
 {
 	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
 	exit;
@@ -164,26 +164,46 @@ class _Forums
 	}
 
 	/**
-	 * @brief	Store image proxy status ( true = enabled )
+	 * @brief	Use the cached image URL instead of the original URL
 	 */
-	protected $_imageProxyStatus = null;
+	protected $proxyUrl	= FALSE;
 
 	/**
 	 * Rebuild content to add or remove image proxy
 	 *
 	 * @param	int|null		$offset		Offset to start from
 	 * @param	int|null		$max		Maximum to parse
-	 * @param	bool			$status		Enable/Disable Image Proxy
+	 * @param	bool			$proxyUrl	Use the cached image URL instead of the original URL
 	 * @return	int			Number completed
 	 * @note	This method is optional and will only be called if it exists
 	 */
-	public function rebuildImageProxy( $offset, $max, $status=TRUE )
+	public function rebuildImageProxy( $offset, $max, $proxyUrl = FALSE )
 	{
-		$this->_imageProxyStatus = $status;
-
+		$this->proxyUrl = $proxyUrl;
 		return $this->performRebuild( $offset, $max, 'parseImageProxy' );
 	}
 
+	/**
+	 * @brief	Store lazy loading status ( true = enabled )
+	 */
+	protected $_lazyLoadStatus = null;
+
+	/**
+	 * Rebuild content to add or remove lazy loading
+	 *
+	 * @param	int|null		$offset		Offset to start from
+	 * @param	int|null		$max		Maximum to parse
+	 * @param	bool			$status		Enable/Disable lazy loading
+	 * @return	int			Number completed
+	 * @note	This method is optional and will only be called if it exists
+	 */
+	public function rebuildLazyLoad( $offset, $max, $status=TRUE )
+	{
+		$this->_lazyLoadStatus = $status;
+
+		return $this->performRebuild( $offset, $max, 'parseLazyLoad' );
+	}
+
 	/**
 	 * Perform rebuild - abstracted as the call for rebuildContent() and rebuildAttachmentImages() is nearly identical
 	 *
@@ -205,11 +225,15 @@ class _Forums
 			{
 				if( $callback == 'parseImageProxy' )
 				{
-					$rebuilt = \IPS\Text\Parser::parseImageProxy( $word['word_custom'], $this->_imageProxyStatus );
+					$rebuilt = \IPS\Text\Parser::removeImageProxy( $word['word_custom'], $this->proxyUrl );
+				}
+				elseif( $callback == 'parseLazyLoad' )
+				{
+					$rebuilt = \IPS\Text\Parser::parseLazyLoad( $word['word_custom'], $this->_lazyLoadStatus );
 				}
 				else
 				{
-					$rebuilt = call_user_func( $callback, $word['word_custom'] );
+					$rebuilt = $callback( $word['word_custom'] );
 				}
 			}
 			catch( \InvalidArgumentException $e )

applications/forums/extensions/core/FileStorage/Cards.php

@@ -0,0 +1,113 @@
+<?php
+/**
+ * @brief		File Storage Extension: Cards
+ * @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
+ * @subpackage	Forums
+ * @since		24 January 2020
+ */
+
+namespace IPS\forums\extensions\core\FileStorage;
+
+/* To prevent PHP errors (extending class does not exist) revealing path */
+if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+{
+	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
+	exit;
+}
+
+/**
+ * File Storage Extension: Cards
+ */
+class _Cards
+{
+	/**
+	 * Count stored files
+	 *
+	 * @return	int
+	 */
+	public function count()
+	{
+		return \IPS\Db::i()->select( 'COUNT(*)', 'forums_forums', 'card_image IS NOT NULL' )->first();
+	}
+	
+	/**
+	 * Move stored files
+	 *
+	 * @param	int			$offset					This will be sent starting with 0, increasing to get all files stored by this extension
+	 * @param	int			$storageConfiguration	New storage configuration ID
+	 * @param	int|NULL	$oldConfiguration		Old storage configuration ID
+	 * @throws	\Underflowexception				When file record doesn't exist. Indicating there are no more files to move
+	 * @return	void
+	 */
+	public function move( $offset, $storageConfiguration, $oldConfiguration=NULL )
+	{
+		$file = \IPS\Db::i()->select( '*', 'forums_forums', 'card_image IS NOT NULL', 'id', array( $offset, 1 ) )->first();
+		
+		try
+		{
+			$forum = \IPS\forums\Forum::constructFromData( $file );
+			$forum->icon = \IPS\File::get( $oldConfiguration ?: 'forums_Cards', $forum->icon )->move( $storageConfiguration );
+			$forum->save();
+		}
+		catch( \Exception $e )
+		{
+			/* Any issues are logged */
+		}
+	}
+	
+	/**
+	 * Fix all URLs
+	 *
+	 * @param	int			$offset					This will be sent starting with 0, increasing to get all files stored by this extension
+	 * @return void
+	 */
+	public function fixUrls( $offset )
+	{
+		$forum = \IPS\forums\Forum::constructFromData( \IPS\Db::i()->select( '*', 'forums_forums', 'card_image IS NOT NULL', 'id', array( $offset, 1 ) )->first() );
+		
+		if ( $new = \IPS\File::repairUrl( $forum->icon ) )
+		{
+			$forum->icon = $new;
+			$forum->save();
+		}
+	}
+	
+	/**
+	 * Check if a file is valid
+	 *
+	 * @param	string	$file		The file path to check
+	 * @return	bool
+	 */
+	public function isValidFile( $file )
+	{
+		try
+		{
+			\IPS\Db::i()->select( 'id', 'forums_forums', array( 'card_image=?', $file ) )->first();
+			return TRUE;
+		}
+		catch ( \UnderflowException $e )
+		{
+			return FALSE;
+		}
+	}
+
+	/**
+	 * Delete all stored files
+	 *
+	 * @return	void
+	 */
+	public function delete()
+	{
+		foreach( \IPS\Db::i()->select( '*', 'forums_forums', "card_image IS NOT NULL" ) as $forum )
+		{
+			try
+			{
+				\IPS\File::get( 'forums_Cards', $forum['icon'] )->delete();
+			}
+			catch( \Exception $e ){}
+		}
+	}
+}

applications/forums/extensions/core/FileStorage/Icons.php

@@ -12,7 +12,7 @@
 namespace IPS\forums\extensions\core\FileStorage;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
 {
 	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
 	exit;

applications/forums/extensions/core/FrontNavigation/Forums.php

@@ -12,7 +12,7 @@
 namespace IPS\forums\extensions\core\FrontNavigation;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
 {
 	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
 	exit;

applications/forums/extensions/core/LiveSearch/Forums.php

@@ -12,7 +12,7 @@
 namespace IPS\forums\extensions\core\LiveSearch;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
 {
 	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
 	exit;
@@ -26,7 +26,7 @@ class _Forums
 	/**
 	 * Check we have access
 	 *
-	 * @return	void
+	 * @return	bool
 	 */
 	public function hasAccess()
 	{
@@ -37,7 +37,7 @@ class _Forums
 	/**
 	 * Get the search results
 	 *
-	 * @param	string	Search Term
+	 * @param	string	$searchTerm	Search Term
 	 * @return	array 	Array of results
 	 */
 	public function getResults( $searchTerm )

applications/forums/extensions/core/MemberSync/Forums.php

@@ -12,7 +12,7 @@
 namespace IPS\forums\extensions\core\MemberSync;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
 {
 	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
 	exit;
@@ -32,23 +32,30 @@ class _Forums
 	 */
 	public function onMerge( $member, $member2 )
 	{
-		\IPS\Db::i()->update( 'forums_answer_ratings', array( 'member' => $member->member_id ), array( 'member=?', $member2->member_id ), array(), NULL, \IPS\Db::IGNORE );
-		\IPS\Db::i()->update( 'forums_question_ratings', array( 'member' => $member->member_id ), array( 'member=?', $member2->member_id ), array(), NULL, \IPS\Db::IGNORE );
+		\IPS\Db::i()->update( 'forums_answer_ratings', array( 'member' => $member->member_id ), array( '`member`=?', $member2->member_id ), array(), NULL, \IPS\Db::IGNORE );
+		\IPS\Db::i()->update( 'forums_question_ratings', array( 'member' => $member->member_id ), array( '`member`=?', $member2->member_id ), array(), NULL, \IPS\Db::IGNORE );
 		\IPS\Db::i()->update( 'forums_view_method', array( 'member_id' => $member->member_id ), array( 'member_id=?', $member2->member_id ), array(), NULL, \IPS\Db::IGNORE );
-		\IPS\Db::i()->update( 'forums_rss_import', array( 'rss_import_mid' => $member->member_id ), array( 'rss_import_mid=?', $member2->member_id ) );
 		
 		if ( \IPS\Settings::i()->archive_on )
 		{
-			$archiveStorage = !\IPS\Settings::i()->archive_remote_sql_host ? \IPS\Db::i() : \IPS\Db::i( 'archive', array(
-				'sql_host'		=> \IPS\Settings::i()->archive_remote_sql_host,
-				'sql_user'		=> \IPS\Settings::i()->archive_remote_sql_user,
-				'sql_pass'		=> \IPS\Settings::i()->archive_remote_sql_pass,
-				'sql_database'	=> \IPS\Settings::i()->archive_remote_sql_database,
-				'sql_port'		=> \IPS\Settings::i()->archive_sql_port,
-				'sql_socket'	=> \IPS\Settings::i()->archive_sql_socket,
-				'sql_tbl_prefix'=> \IPS\Settings::i()->archive_sql_tbl_prefix,
-				'sql_utf8mb4'	=> isset( \IPS\Settings::i()->sql_utf8mb4 ) ? \IPS\Settings::i()->sql_utf8mb4 : FALSE
-			) );
+			/* Connect to the remote DB if needed */
+			if ( \IPS\CIC2 )
+			{
+				$archiveStorage = \IPS\Cicloud\getForumArchiveDb();
+			}
+			else
+			{
+				$archiveStorage = ( !\IPS\Settings::i()->archive_remote_sql_host ) ? \IPS\Db::i() : \IPS\Db::i( 'archive', array(
+					'sql_host'		=> \IPS\Settings::i()->archive_remote_sql_host,
+					'sql_user'		=> \IPS\Settings::i()->archive_remote_sql_user,
+					'sql_pass'		=> \IPS\Settings::i()->archive_remote_sql_pass,
+					'sql_database'	=> \IPS\Settings::i()->archive_remote_sql_database,
+					'sql_port'		=> \IPS\Settings::i()->archive_sql_port,
+					'sql_socket'	=> \IPS\Settings::i()->archive_sql_socket,
+					'sql_tbl_prefix'=> \IPS\Settings::i()->archive_sql_tbl_prefix,
+					'sql_utf8mb4'	=> isset( \IPS\Settings::i()->sql_utf8mb4 ) ? \IPS\Settings::i()->sql_utf8mb4 : FALSE
+				) );
+			}
 			$archiveStorage->update( 'forums_archive_posts', array( 'archive_author_id' => $member->member_id ), array( 'archive_author_id=?', $member2->member_id ) );
 		}
 	}
@@ -61,9 +68,8 @@ class _Forums
 	 */
 	public function onDelete( $member )
 	{
-		\IPS\Db::i()->delete( 'forums_answer_ratings', array( 'member=?', $member->member_id ) );
-		\IPS\Db::i()->delete( 'forums_question_ratings', array( 'member=?', $member->member_id ) );
+		\IPS\Db::i()->delete( 'forums_answer_ratings', array( '`member`=?', $member->member_id ) );
+		\IPS\Db::i()->delete( 'forums_question_ratings', array( '`member`=?', $member->member_id ) );
 		\IPS\Db::i()->delete( 'forums_view_method', array( 'member_id=?', $member->member_id ) );
-		\IPS\Db::i()->update( 'forums_rss_import', array( 'rss_import_mid' => 0 ), array( 'rss_import_mid=?', $member->member_id ) );
 	}
 }

applications/forums/extensions/core/MobileNavigation/Forums.php

@@ -0,0 +1,75 @@
+<?php
+/**
+ * @brief		Mobile Navigation Extension: Forums
+ * @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
+ * @subpackage	Forums
+ * @since		12 Jun 2019
+ */
+
+namespace IPS\forums\extensions\core\MobileNavigation;
+
+/* To prevent PHP errors (extending class does not exist) revealing path */
+if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+{
+	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
+	exit;
+}
+
+/**
+ * Mobile Navigation Extension: Topics
+ */
+class _Forums extends \IPS\core\MobileNavigation\MobileNavigationAbstract
+{
+	/**
+	 * Get Type Title which will display in the AdminCP Menu Manager
+	 *
+	 * @return	string
+	 */
+	public static function typeTitle()
+	{
+		return \IPS\Member::loggedIn()->language()->addToStack('mobilenavigation_Forums');
+	}
+	
+	/**
+	 * Can the currently logged in user access the content this item links to?
+	 *
+	 * @return	bool
+	 */
+	public function canAccessContent()
+	{
+		return \IPS\Member::loggedIn()->canAccessModule( \IPS\Application\Module::get( 'forums', 'forums', 'front' ) );
+	}
+	
+	/**
+	 * Get Title
+	 *
+	 * @return	string
+	 */
+	public function title()
+	{
+		return \IPS\Member::loggedIn()->language()->addToStack('mobilenavigation_Forums');
+	}
+	
+	/**
+	 * Get Link
+	 *
+	 * @return	\IPS\Http\Url
+	 */
+	public function link()
+	{
+		return \IPS\Http\Url::internal( "app=forums&module=forums&controller=index&method=table", 'front', 'forums' );
+	}
+
+	/**
+	 * Return icon
+	 *
+	 * @return	string|null
+	 */
+	public function icon()
+	{
+		return 'LIST_ROWS';
+	}
+}

applications/forums/extensions/core/MobileNavigation/Topics.php

@@ -0,0 +1,75 @@
+<?php
+/**
+ * @brief		Mobile Navigation Extension: Topics
+ * @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
+ * @subpackage	Forums
+ * @since		12 Jun 2019
+ */
+
+namespace IPS\forums\extensions\core\MobileNavigation;
+
+/* To prevent PHP errors (extending class does not exist) revealing path */
+if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+{
+	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
+	exit;
+}
+
+/**
+ * Mobile Navigation Extension: Topics
+ */
+class _Topics extends \IPS\core\MobileNavigation\MobileNavigationAbstract
+{
+	/**
+	 * Get Type Title which will display in the AdminCP Menu Manager
+	 *
+	 * @return	string
+	 */
+	public static function typeTitle()
+	{
+		return \IPS\Member::loggedIn()->language()->addToStack('mobilenavigation_Topics');
+	}
+		
+	/**
+	 * Can the currently logged in user access the content this item links to?
+	 *
+	 * @return	bool
+	 */
+	public function canAccessContent()
+	{
+		return \IPS\Member::loggedIn()->canAccessModule( \IPS\Application\Module::get( 'forums', 'forums', 'front' ) );
+	}
+	
+	/**
+	 * Get Title
+	 *
+	 * @return	string
+	 */
+	public function title()
+	{
+		return \IPS\Member::loggedIn()->language()->addToStack('mobilenavigation_Topics');
+	}
+	
+	/**
+	 * Get Link
+	 *
+	 * @return	\IPS\Http\Url
+	 */
+	public function link()
+	{
+		return \IPS\Http\Url::internal( "app=forums&module=forums&controller=index&method=fluid", 'front', 'forums' );
+	}
+
+	/**
+	 * Return icon
+	 *
+	 * @return	string|null
+	 */
+	public function icon()
+	{
+		return 'COMMENTS';
+	}
+}

applications/forums/extensions/core/Permissions/Permissions.php

@@ -12,7 +12,7 @@
 namespace IPS\forums\extensions\core\Permissions;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
 {
 	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
 	exit;

applications/forums/extensions/core/Queue/DeleteLegacyPosts.php

@@ -12,7 +12,7 @@
 namespace IPS\forums\extensions\core\Queue;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
 {
 	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
 	exit;
@@ -46,16 +46,16 @@ class _DeleteLegacyPosts
 	 */
 	public function run( $data, $offset )
 	{
-		$select = \IPS\Db::i()->select( '*', 'forums_posts', 'queued > 2', 'pid ASC', array( 0, 5 ) );
-		if ( !count( $select ) )
+		$select = \IPS\Db::i()->select( '*', 'forums_posts', 'queued > 2', 'pid ASC', array( 0, \IPS\REBUILD_NORMAL ) );
+		if ( !\count( $select ) )
 		{
 			throw new \IPS\Task\Queue\OutOfRangeException;
 		}
-		
+
 		$done = 0;
 		foreach( new \IPS\Patterns\ActiveRecordIterator( $select, 'IPS\forums\Topic\Post' ) as $post )
 		{
-			$post->delete();
+			$post->logDelete( FALSE );
 			$done++;
 		}
 		

applications/forums/extensions/core/Queue/DeleteLegacyTopics.php

@@ -12,7 +12,7 @@
 namespace IPS\forums\extensions\core\Queue;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
 {
 	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
 	exit;
@@ -46,16 +46,16 @@ class _DeleteLegacyTopics
 	 */
 	public function run( $data, $offset )
 	{
-		$select = \IPS\Db::i()->select( '*', 'forums_topics', 'approved > 1', 'tid ASC', array( 0, 5 ) );
-		if ( !count( $select ) )
+		$select = \IPS\Db::i()->select( '*', 'forums_topics', 'approved > 1', 'tid ASC', array( 0, \IPS\REBUILD_NORMAL ) );
+		if ( !\count( $select ) )
 		{
 			throw new \IPS\Task\Queue\OutOfRangeException;
 		}
-		
+
 		$done = 0;
 		foreach( new \IPS\Patterns\ActiveRecordIterator( $select, 'IPS\forums\Topic' ) as $topic )
 		{
-			$topic->delete();
+			$topic->logDelete( FALSE );
 			$done++;
 		}
 		

applications/forums/extensions/core/Queue/HiddenFirstPost.php

@@ -12,7 +12,7 @@
 namespace IPS\forums\extensions\core\Queue;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
 {
 	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
 	exit;
@@ -46,8 +46,8 @@ class _HiddenFirstPost
 	 */
 	public function run( $data, $offset )
 	{
-		$select = \IPS\Db::i()->select( '*', 'forums_posts', 'new_topic = 1 and queued = -1', 'topic_id ASC', array( 0, 50 ) );
-		if ( !count( $select ) )
+		$select = \IPS\Db::i()->select( '*', 'forums_posts', 'new_topic = 1 and queued = -1', 'topic_id ASC', array( 0, \IPS\REBUILD_SLOW ) );
+		if ( !\count( $select ) )
 		{
 			throw new \IPS\Task\Queue\OutOfRangeException;
 		}

applications/forums/extensions/core/Queue/RebuildNewTopicFlag.php

@@ -12,7 +12,7 @@
 namespace IPS\forums\extensions\core\Queue;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
 {
 	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
 	exit;
@@ -34,6 +34,7 @@ class _RebuildNewTopicFlag
 		try
 		{
 			$data['count'] = \IPS\Db::i()->select( 'MAX(tid)', 'forums_topics' )->first();
+			$data['realCount'] = \IPS\Db::i()->select( 'COUNT(*)', 'forums_topics' )->first();
 		}
 		catch( \Exception $e )
 		{
@@ -44,6 +45,8 @@ class _RebuildNewTopicFlag
 		{
 			return NULL;
 		}
+
+		$data['completed'] = 0;
 		
 		return $data;
 	}
@@ -56,7 +59,7 @@ class _RebuildNewTopicFlag
 	 * @return	int							New offset
 	 * @throws	\IPS\Task\Queue\OutOfRangeException	Indicates offset doesn't exist and thus task is complete
 	 */
-	public function run( $data, $offset )
+	public function run( &$data, $offset )
 	{
 		if ( !class_exists( 'IPS\forums\Topic' ) OR !\IPS\Application::appisEnabled( 'forums' ) )
 		{
@@ -70,7 +73,7 @@ class _RebuildNewTopicFlag
 		$firstPostIds				= array();
 		$firstPostArchivedIds		= array();
 		
-		foreach( new \IPS\Patterns\ActiveRecordIterator( \IPS\Db::i()->select( '*', 'forums_topics', array( "tid>?", $offset ), "tid ASC", array( 0, 50 ) ), 'IPS\forums\Topic' ) AS $topic )
+		foreach( new \IPS\Patterns\ActiveRecordIterator( \IPS\Db::i()->select( '*', 'forums_topics', array( "tid>?", $offset ), "tid ASC", array( 0, \IPS\REBUILD_SLOW ) ), 'IPS\forums\Topic' ) AS $topic )
 		{
 			if ( $topic->isArchived() == FALSE )
 			{
@@ -103,26 +106,27 @@ class _RebuildNewTopicFlag
 				catch( \UnderflowException $e ) {}
 			}
 
+			$data['completed']++;
 			$last = $topic->tid;
 		}
 
 		/* Reset flags as needed */
-		if( count( $topicIdsToReset ) )
+		if( \count( $topicIdsToReset ) )
 		{
 			\IPS\Db::i()->update( 'forums_posts', array( 'new_topic' => 0 ), array( 'topic_id IN(' . implode( ',', $topicIdsToReset ) . ')' ) );
 		}
 
-		if( count( $firstPostIds ) )
+		if( \count( $firstPostIds ) )
 		{
 			\IPS\Db::i()->update( 'forums_posts', array( 'new_topic' => 1 ), array( 'pid IN(' . implode( ',', $firstPostIds ) . ')' ) );
 		}
 
-		if( count( $archivedTopicIdsToReset ) )
+		if( \count( $archivedTopicIdsToReset ) )
 		{
 			\IPS\forums\Topic\ArchivedPost::db()->update( 'forums_archive_posts', array( 'archive_is_first' => 0 ), array( 'archive_topic_id IN(' . implode( ',', $archivedTopicIdsToReset ) . ')' ) );
 		}
 
-		if( count( $firstPostArchivedIds ) )
+		if( \count( $firstPostArchivedIds ) )
 		{
 			\IPS\forums\Topic\ArchivedPost::db()->update( 'forums_archive_posts', array( 'archive_is_first' => 1 ), array( 'archive_id IN(' . implode( ',', $firstPostArchivedIds ) . ')' ) );
 		}
@@ -145,6 +149,6 @@ class _RebuildNewTopicFlag
 	 */
 	public function getProgress( $data, $offset )
 	{
-		return array( 'text' =>  \IPS\Member::loggedIn()->language()->addToStack('queue_rebuilding_new_topic_flag'), 'complete' => $data['count'] ? ( round( 100 / $data['count'] * $offset, 2 ) ) : 100 );
+		return array( 'text' =>  \IPS\Member::loggedIn()->language()->addToStack('queue_rebuilding_new_topic_flag'), 'complete' => $data['realCount'] ? ( round( 100 / $data['realCount'] * $data['completed'], 2 ) ) : 100 );
 	}	
 }

applications/forums/extensions/core/Queue/RebuildSolvedIndex.php

@@ -0,0 +1,121 @@
+<?php
+/**
+ * @brief		Background Task: Rebuild Solved Index
+ * @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		20 February 2020
+ */
+
+namespace IPS\forums\extensions\core\Queue;
+
+/* To prevent PHP errors (extending class does not exist) revealing path */
+if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+{
+	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
+	exit;
+}
+
+/**
+ * Background Task: Rebuild Solved Index
+ */
+class _RebuildSolvedIndex
+{
+	/**
+	 * Parse data before queuing
+	 *
+	 * @param	array	$data
+	 * @return	array
+	 */
+	public function preQueueData( $data )
+	{
+		try
+		{
+			$data['count'] = \IPS\Db::i()->select( 'MAX(tid)', 'forums_topics', array( 'topic_answered_pid > 0' ) )->first();
+			$data['realCount'] = \IPS\Db::i()->select( 'COUNT(*)', 'forums_topics', array( 'topic_answered_pid > 0' ) )->first();
+		}
+		catch( \Exception $e )
+		{
+			throw new \OutOfRangeException;
+		}
+		
+		if( $data['count'] == 0 )
+		{
+			return NULL;
+		}
+
+		$data['completed'] = 0;
+		
+		return $data;
+	}
+
+	/**
+	 * Run Background Task
+	 *
+	 * @param	mixed						$data	Data as it was passed to \IPS\Task::queue()
+	 * @param	int							$offset	Offset
+	 * @return	int							New offset
+	 * @throws	\IPS\Task\Queue\OutOfRangeException	Indicates offset doesn't exist and thus task is complete
+	 */
+	public function run( &$data, $offset )
+	{
+		if ( !class_exists( 'IPS\forums\Topic' ) OR !\IPS\Application::appisEnabled( 'forums' ) )
+		{
+			throw new \IPS\Task\Queue\OutOfRangeException;
+		}
+		
+		$last = NULL;
+		
+		foreach( new \IPS\Patterns\ActiveRecordIterator( \IPS\Db::i()->select( '*', 'forums_topics', array( "tid>? and topic_answered_pid > 0", $offset ), "tid ASC", array( 0, \IPS\REBUILD_QUICK ) ), 'IPS\forums\Topic' ) AS $topic )
+		{
+			/* I told him we already got one! */
+			try 
+			{
+				\IPS\Db::i()->select( '*', 'core_solved_index', array( 'comment_class=? and item_id=? and comment_id=?', 'IPS\\forums\\Topic\\Post', $topic->tid, $topic->topic_answered_pid ) )->first();
+			}
+			catch( \UnderflowException $e )
+			{
+				/* No? Best slap it in then */
+				try 
+				{
+					$comment = \IPS\forums\Topic\Post::load( $topic->topic_answered_pid );
+					
+					\IPS\Db::i()->insert( 'core_solved_index', array(
+						'member_id' => $comment->author()->member_id,
+						'app'	=> 'forums',
+						'comment_class' => 'IPS\\forums\\Topic\\Post',
+						'comment_id' => $comment->pid,
+						'item_id'	 => $topic->tid,
+						'solved_date' => $comment->post_date // We don't have the real solve date so this will have to do
+					) );
+				}
+				catch( \Exception $e ) { }
+			}
+			
+			$data['completed']++;
+			$last = $topic->tid;
+		}
+
+		if( $last === NULL )
+		{
+			throw new \IPS\Task\Queue\OutOfRangeException;
+		}
+		
+		return $last;
+	}
+	
+	/**
+	 * Get Progress
+	 *
+	 * @param	mixed					$data	Data as it was passed to \IPS\Task::queue()
+	 * @param	int						$offset	Offset
+	 * @return	array( 'text' => 'Doing something...', 'complete' => 50 )	Text explaining task and percentage complete
+	 * @throws	\OutOfRangeException	Indicates offset doesn't exist and thus task is complete
+	 */
+	public function getProgress( $data, $offset )
+	{
+		return array( 'text' =>  \IPS\Member::loggedIn()->language()->addToStack('queue_rebuilding_solved_posts'), 'complete' => $data['realCount'] ? ( round( 100 / $data['realCount'] * $data['completed'], 2 ) ) : 100 );
+	}	
+
+}

applications/forums/extensions/core/Queue/TopicStarterIds.php

@@ -12,7 +12,7 @@
 namespace IPS\forums\extensions\core\Queue;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
 {
 	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
 	exit;
@@ -23,11 +23,6 @@ if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
  */
 class _TopicStarterIds
 {
-	/**
-	 * @brief Number of topics to build per cycle
-	 */
-	public $perCycle	= 500;
-	
 	/**
 	 * Parse data before queuing
 	 *
@@ -50,6 +45,8 @@ class _TopicStarterIds
 			return null;
 		}
 
+		$data['completed'] = 0;
+
 		return $data;
 	}
 
@@ -63,17 +60,21 @@ class _TopicStarterIds
 	 */
 	public function run( &$data, $offset )
 	{
-		$count = 0;
+		$last = NULL;
 
-		foreach( \IPS\Db::i()->select( '*', 'forums_topics', array(), 'tid ASC', array( $offset, $this->perCycle ) ) as $topic )
+		foreach( \IPS\Db::i()->select( 'tid, starter_id', 'forums_topics', array( 'tid>?', $offset ), 'tid ASC', array( 0, \IPS\REBUILD_QUICK ) ) as $topic )
 		{
-			$count++;
+			$last = $topic['tid'];
+			$data['completed']++;
 
 			try
 			{
 				$firstPost = \IPS\Db::i()->select( 'author_id', 'forums_posts', array( 'new_topic=? AND topic_id=?', 1, $topic['tid'] ), 'pid ASC', array( 0, 1 ) )->first();
 
-				\IPS\Db::i()->update( 'forums_topics', array( 'starter_id' => $firstPost ), array( 'tid=?', $topic['tid'] ) );
+				if( $firstPost != $topic['starter_id'] )
+				{
+					\IPS\Db::i()->update( 'forums_topics', array( 'starter_id' => $firstPost ), array( 'tid=?', $topic['tid'] ) );
+				}
 			}
 			catch( \UnderflowException $e )
 			{
@@ -81,12 +82,12 @@ class _TopicStarterIds
 			}
 		}
 
-		if( !$count )
+		if( $last === NULL )
 		{
 			throw new \IPS\Task\Queue\OutOfRangeException;
 		}
 
-		return ( $offset + $count );
+		return $last;
 	}
 	
 	/**
@@ -99,6 +100,6 @@ class _TopicStarterIds
 	 */
 	public function getProgress( $data, $offset )
 	{
-		return array( 'text' => \IPS\Member::loggedIn()->language()->addToStack('rebuilding_starter_ids'), 'complete' => round( 100 / $data['count'] * $offset, 2 ) );
+		return array( 'text' => \IPS\Member::loggedIn()->language()->addToStack('rebuilding_starter_ids'), 'complete' => round( 100 / $data['count'] * $data['completed'], 2 ) );
 	}	
 }

applications/forums/extensions/core/RssImport/RssImport.php

@@ -0,0 +1,168 @@
+<?php
+/**
+ * @brief		RSS Import extension: RssImport
+ * @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
+ * @subpackage	Forums
+ * @since		09 Oct 2019
+ */
+
+namespace IPS\forums\extensions\core\RssImport;
+
+/* To prevent PHP errors (extending class does not exist) revealing path */
+if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+{
+	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
+	exit;
+}
+
+/**
+ * @brief	RSS Import extension: RssImport
+ */
+class _RssImport
+{
+	/**
+	 * @brief	RSSImport Class
+	 */
+	public $classes = array();
+
+	public $fileStorage = 'forums_Forums';
+
+	/**
+	 * Constructor
+	 *
+	 * @return	void
+	 */
+	public function __construct()
+	{
+		$this->classes = array( 'IPS\\forums\\Topic' );
+	}
+
+	/**
+	 * Return available options for a Form\Select
+	 *
+	 * @return array
+	 */
+	public function availableOptions()
+	{
+		return array( 'IPS\\forums\\Topic' => \IPS\Member::loggedIn()->language()->addToStack('__app_forums') );
+	}
+
+	/**
+	 * Show in the Admin CP?
+	 *
+	 * @param	Object 	$class	The class to check
+	 * @return boolean
+	 */
+	public function showInAdminCp( $class ): bool
+	{
+		return true;
+	}
+
+	/**
+	 * Node selector options
+	 *
+	 * @param 	\IPS\core\Rss\Import|null	$rss	Existing RSS object if editing|NULL if not
+	 * @return array
+	 */
+	public function nodeSelectorOptions( $rss )
+	{
+		return array( 'class' => 'IPS\forums\Forum', 'permissionCheck' => function ( $forum )
+		{
+			return $forum->sub_can_post and !$forum->redirect_url;
+		} );
+	}
+
+	/**
+	 * @param \IPS\core\Rss\Import 	$rss 		RSS object
+	 * @param array 				$article 	RSS feed article importing
+	 * @param \IPS\Node\Model 		$container  Container object
+	 * @param	string				$content	Post content with read more link if set
+	 * @return \IPS\Content
+	 */
+	public function create( \IPS\core\Rss\Import $rss, $article, \IPS\Node\Model $container, $content )
+	{
+		$settings = $rss->settings;
+		$class = $rss->_class;
+		$member = \IPS\Member::load( $rss->member );
+		$topic = $class::createItem( $member, NULL, $article['date'], $container, $settings['topic_hide'] );
+		$topic->title = $rss->topic_pre . $article['title'];
+
+		if ( ! $settings['topic_open'] )
+		{
+			$topic->state = 'closed';
+		}
+
+		$topic->save();
+
+		/* Send notifications */
+		if ( !$settings['topic_hide'] )
+		{
+			$topic->sendNotifications();
+		}
+
+		/* Add to search index */
+		\IPS\Content\Search\Index::i()->index( $topic );
+
+		$post = \IPS\forums\Topic\Post::create( $topic, $content, TRUE, NULL, \IPS\forums\Topic\Post::incrementPostCount( $container ), $member, $article['date'] );
+		$topic->topic_firstpost = $post->pid;
+
+		$topic->save();
+
+		/* Claim any attachments */
+		if ( isset( $article['attachment'] ) )
+		{
+			\IPS\Db::i()->insert( 'core_attachments_map', array(
+				'attachment_id' => $article['attachment']['attach_id'],
+				'location_key' => 'forums_Forums',
+				'id1' => $topic->tid,
+				'id2' => $post->pid,
+			) );
+		}
+		return $topic;
+	}
+
+	/**
+	 * Addition Form elements
+	 *
+	 * @param	\IPS\Helpers\Form			$form	The form
+	 * @param	\IPS\core\Rss\Import|null		$rss	Existing RSS object if editing|NULL if not
+	 * @return	void
+	 */
+	public function form( &$form, $rss=NULL )
+	{
+		$settings = NULL;
+
+		if ( $rss )
+		{
+			$settings = $rss->settings;
+		}
+
+		/* Make rss_import_node_id make sense for forums */
+		\IPS\Member::loggedIn()->language()->words['rss_import_node_id'] = \IPS\Member::loggedIn()->language()->addToStack('topic_container');
+
+		$form->add( new \IPS\Helpers\Form\Radio( 'rss_import_topic_open', ( $settings ? $settings['topic_open'] : 1 ), FALSE, array( 'options' => array( 1 => 'unlocked', 0 => 'locked' ) ) ) );
+		$form->add( new \IPS\Helpers\Form\Radio( 'rss_import_topic_hide', ( $settings ? $settings['topic_hide'] : 0 ), FALSE, array( 'options' => array( 0 => 'unhidden', 1 => 'hidden' ) ) ) );
+	}
+
+	/**
+	 * Process additional fields unique to this extension
+	 *
+	 * @param	array				$values	Values from form
+	 * @param	\IPS\core\Rss\Import		$rss	Existing RSS object
+	 * @return	array
+	 */
+	public function saveForm( &$values, $rss )
+	{
+		$return = array(
+			'topic_open' => $values['rss_import_topic_open'],
+			'topic_hide' => $values['rss_import_topic_hide']
+		);
+
+		unset( $values['rss_import_topic_open'], $values['rss_import_topic_hide'] );
+
+		return $return;
+	}
+}