Version 4.5.0

applications/convert/extensions/core/Queue/RebuildFirstPostIds.php

@@ -5,14 +5,14 @@
  * @copyright	(c) Invision Power Services, Inc.
  * @license		https://www.invisioncommunity.com/legal/standards/
  * @package		Invision Community
- * @subpackage	Converter
+ * @subpackage	convert
  * @since		26 Feb 2016
  */
 
 namespace IPS\convert\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;
@@ -26,7 +26,7 @@ class _RebuildFirstPostIds
 	/**
 	 * Parse data before queuing
 	 *
-	 * @param	array	$data
+	 * @param	array	$data	Data
 	 * @return	array
 	 */
 	public function preQueueData( $data )
@@ -45,6 +45,8 @@ class _RebuildFirstPostIds
 			return NULL;
 		}
 
+		$data['completed'] = 0;
+
 		return $data;
 	}
 
@@ -56,7 +58,7 @@ class _RebuildFirstPostIds
 	 * @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 +72,7 @@ class _RebuildFirstPostIds
 		$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 )
 			{
@@ -104,25 +106,26 @@ class _RebuildFirstPostIds
 			}
 
 			$last = $topic->tid;
+			$data['completed']++;
 		}
 
 		/* 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 ) . ')' ) );
 		}
@@ -140,11 +143,10 @@ class _RebuildFirstPostIds
 	 *
 	 * @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
+	 * @return	array	Text explaining task and percentage complete
 	 */
 	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['count'] ? ( round( 100 / $data['count'] * $data['completed'], 2 ) ) : 100 );
 	}
 }