Version 4.1.2

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

@@ -23,9 +23,23 @@ if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
  * @brief	Content Router extension: Topics
  */
 class _Topics
-{
+{	
 	/**
 	 * @brief	Content Item Classes
 	 */
-	public $classes = array( 'IPS\forums\Topic' );
+	public $classes = array();
+	
+	/**
+	 * Constructor
+	 *
+	 * @param	\IPS\Member|NULL	$member		If checking access, the member to check for, or NULL to not check access
+	 * @return	void
+	 */
+	public function __construct( \IPS\Member $member = NULL )
+	{
+		if ( $member === NULL or $member->canAccessModule( \IPS\Application\Module::get( 'forums', 'forums', 'front' ) ) )
+		{
+			$this->classes[] = 'IPS\forums\Topic';
+		}
+	}
 }

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

@@ -22,8 +22,18 @@ if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
 /**
  * Front Navigation Extension: Forums
  */
-class _Forums
+class _Forums extends \IPS\core\FrontNavigation\FrontNavigationAbstract
 {
+	/**
+	 * Get Type Title which will display in the AdminCP Menu Manager
+	 *
+	 * @return	string
+	 */
+	public static function typeTitle()
+	{
+		return \IPS\Member::loggedIn()->language()->addToStack('frontnavigation_forums');
+	}
+		
 	/**
 	 * Can access?
 	 *
@@ -31,7 +41,7 @@ class _Forums
 	 */
 	public function canView()
 	{
-		return !\IPS\Application::load('forums')->hide_tab and \IPS\Member::loggedIn()->canAccessModule( \IPS\Application\Module::get( 'forums', 'forums' ) );
+		return parent::canView() and \IPS\Member::loggedIn()->canAccessModule( \IPS\Application\Module::get( 'forums', 'forums' ) );
 	}
 	
 	/**
@@ -63,14 +73,4 @@ class _Forums
 	{
 		return \IPS\Dispatcher::i()->application->directory === 'forums';
 	}
-	
-	/**
-	 * Children
-	 *
-	 * @return	array
-	 */
-	public function children()
-	{
-		return array();
-	}
 }

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

@@ -24,6 +24,19 @@ if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
  */
 class _DeleteLegacyPosts
 {
+	/**
+	 * Parse data before queuing
+	 *
+	 * @param	array	$data
+	 * @return	array
+	 */
+	public function preQueueData( $data )
+	{
+		$data['count'] = \IPS\Db::i()->select( 'COUNT(*)', 'forums_posts', 'queued > 2' )->first();
+		
+		return $data;
+	}
+	
 	/**
 	 * Run Background Task
 	 *
@@ -60,7 +73,6 @@ class _DeleteLegacyPosts
 	 */
 	public function getProgress( $data, $offset )
 	{
-		$count = \IPS\Db::i()->select( 'COUNT(*)', 'forums_posts', 'queued > 2' )->first();
-		return array( 'text' => \IPS\Member::loggedIn()->language()->addToStack('queue_deleting_legacy_posts'), 'complete' => 100 / ( $count ?: 1 + $offset ) * $offset );
+		return array( 'text' => \IPS\Member::loggedIn()->language()->addToStack('queue_deleting_legacy_posts'), 'complete' => 100 / ( $data['count'] ?: 1 + $offset ) * $offset );
 	}	
 }

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

@@ -24,6 +24,19 @@ if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
  */
 class _DeleteLegacyTopics
 {
+	/**
+	 * Parse data before queuing
+	 *
+	 * @param	array	$data
+	 * @return	array
+	 */
+	public function preQueueData( $data )
+	{
+		$data['count'] = \IPS\Db::i()->select( 'COUNT(*)', 'forums_topics', 'approved > 1' )->first();
+		
+		return $data;
+	}
+	
 	/**
 	 * Run Background Task
 	 *
@@ -60,7 +73,6 @@ class _DeleteLegacyTopics
 	 */
 	public function getProgress( $data, $offset )
 	{
-		$count = \IPS\Db::i()->select( 'COUNT(*)', 'forums_topics', 'approved > 1' )->first();
-		return array( 'text' => \IPS\Member::loggedIn()->language()->addToStack('queue_deleting_legacy_topics'), 'complete' => 100 / ( $count ?: 1 + $offset ) * $offset );
+		return array( 'text' => \IPS\Member::loggedIn()->language()->addToStack('queue_deleting_legacy_topics'), 'complete' => 100 / ( $data['count'] ?: 1 + $offset ) * $offset );
 	}	
 }