Version 5.0.13

applications/downloads/extensions/core/AchievementAction/DownloadFile.php

@@ -47,7 +47,7 @@ class DownloadFile extends AchievementActionAbstract
 	 */
 	public function filters( ?array $filters, Url $url ): array
 	{
-		$return	= array();
+		$return	= parent::filters( $filters, $url );
 
 		$return['nodes'] = new Node( 'achievement_filter_DownloadFile_nodes', ( $filters and isset( $filters['nodes'] ) and $filters['nodes'] ) ? $filters['nodes'] : 0, FALSE, [
 			'url'				=> $url,
@@ -74,7 +74,7 @@ class DownloadFile extends AchievementActionAbstract
 	 */
 	public function formatFilterValues( array $values ): array
 	{
-		$return = [];
+		$return = parent::formatFilterValues( $values );
 		if ( isset( $values['achievement_filter_DownloadFile_nodes'] ) )
 		{
 			$return['nodes'] = array_keys( $values['achievement_filter_DownloadFile_nodes'] );
@@ -145,6 +145,38 @@ class DownloadFile extends AchievementActionAbstract
 	{
 		return [ $extra['downloader'] ];
 	}
+
+	/**
+	 * Determines if the member has already completed this rule.
+	 * Used for retroactive rule completion.
+	 * So far, this is only used in Quests, but may be used elsewhere at a later point.
+	 *
+	 * @param Member $member
+	 * @param array $filters
+	 * @return bool
+	 */
+	public function isRuleCompleted( Member $member, array $filters ) : bool
+	{
+		$where = [
+			[ 'dmid=?', $member->member_id ]
+		];
+
+		if( !empty( $filters['nodes'] ) )
+		{
+			$where[] = [ Db::i()->in( 'file_cat', $filters['nodes'] ) ];
+		}
+
+		$total = Db::i()->select( 'count(*)', 'downloads_downloads', $where )
+			->join( 'downloads_files', 'dfid=file_id' )
+			->first();
+
+		if( !empty( $filters['milestone'] ) )
+		{
+			return $total >= $filters['milestone'];
+		}
+
+		return $total > 0;
+	}
 	
 	/**
 	 * Get identifier to prevent the member being awarded points for the same action twice
@@ -198,7 +230,7 @@ class DownloadFile extends AchievementActionAbstract
 		{
 			$conditions[] = Member::loggedIn()->language()->addToStack( 'achievements_title_filter_milestone', FALSE, [
 				'htmlsprintf' => [
-					Theme::i()->getTemplate( 'achievements' )->ruleDescriptionBadge( 'milestone', Member::loggedIn()->language()->addToStack( 'achievements_title_filter_milestone_nth', FALSE, [ 'pluralize' => [ $rule->filters['milestone'] ] ] ) )
+					Theme::i()->getTemplate( 'achievements', 'core' )->ruleDescriptionBadge( 'milestone', Member::loggedIn()->language()->addToStack( 'achievements_title_filter_milestone_nth', FALSE, [ 'pluralize' => [ $rule->filters['milestone'] ] ] ) )
 				],
 				'sprintf'		=> [ Member::loggedIn()->language()->addToStack('AchievementAction__DownloadFile_title_generic') ]
 			] );
@@ -209,7 +241,12 @@ class DownloadFile extends AchievementActionAbstract
 			$conditions[] = $nodeCondition;
 		}
 
-		return Theme::i()->getTemplate( 'achievements' )->ruleDescription(
+		if( $questCondition = $this->_questFilterDescription( $rule ) )
+		{
+			$conditions[] = $questCondition;
+		}
+
+		return Theme::i()->getTemplate( 'achievements', 'core' )->ruleDescription(
 			Member::loggedIn()->language()->addToStack( 'AchievementAction__DownloadFile_title' ),
 			$conditions
 		);
@@ -238,7 +275,7 @@ class DownloadFile extends AchievementActionAbstract
 			{
 				return Member::loggedIn()->language()->addToStack( 'achievements_title_filter_location', FALSE, [
 					'htmlsprintf' => [
-						Theme::i()->getTemplate( 'achievements' )->ruleDescriptionBadge( 'location',
+						Theme::i()->getTemplate( 'achievements', 'core' )->ruleDescriptionBadge( 'location',
 							count( $nodeNames ) === 1 ? $nodeNames[0] : Member::loggedIn()->language()->addToStack( 'achievements_title_filter_location_val', FALSE, [ 'sprintf' => [
 								count( $nodeNames ),
 								Member::loggedIn()->language()->addToStack( 'download_categories_lc', FALSE, [ 'strtolower' => TRUE ] )

applications/downloads/extensions/core/EditorLocations/Categories.php

@@ -158,7 +158,7 @@ class Categories extends EditorLocationsAbstract
 			}
 			catch( InvalidArgumentException $e )
 			{
-				if( $callback[1] == 'parseStatic' AND $e->getcode() == 103014 )
+				if( is_array( $callback ) and $callback[1] == 'parseStatic' AND $e->getcode() == 103014 )
 				{
 					$rebuilt	= preg_replace( "#\[/?([^\]]+?)\]#", '', $word['word_custom'] );
 				}

applications/downloads/extensions/core/OverviewStatistics/Downloads.php

@@ -67,6 +67,20 @@ class Downloads extends OverviewStatisticsAbstract
 	 * @return	string
 	 */
 	public function getBlock( array|string $dateRange = NULL, string $subBlock = NULL ): string
+	{
+		$numbers = $this->getBlockNumbers( $dateRange, $subBlock );
+		return Theme::i()->getTemplate( 'stats' )->overviewComparisonCount( $numbers['statsreports_current_count'], $numbers['statsreports_previous_count'] );
+	}
+
+
+
+	/**
+	 * @param array|string  $dateRange=null
+	 * @param string $subBlock = null
+	 *
+	 * @return array{statsreports_current_count: number|null, statsreports_previous_count: number|null}
+	 */
+	public function getBlockNumbers( array|string $dateRange = null, string $subBlock = null ) : array
 	{
 		$where			= NULL;
 		$previousCount	= NULL;
@@ -92,7 +106,9 @@ class Downloads extends OverviewStatisticsAbstract
 		}
 
 		$count = Db::i()->select( 'COUNT(*)', 'downloads_downloads', $where )->first();
-
-		return Theme::i()->getTemplate( 'stats' )->overviewComparisonCount( $count, $previousCount );
+		return [
+			'statsreports_current_count' => $count,
+			'statsreports_previous_count' => $previousCount,
+		];
 	}
 }

applications/downloads/extensions/core/Queue/StoreMemberViews.php

@@ -39,6 +39,10 @@ class StoreMemberViews extends QueueAbstract
 	 */
 	public function preQueueData( array $data ): ?array
 	{
+		if( !Db::i()->checkForTable( 'downloads_view_method'))
+		{
+			return null;
+		}
 		$data['count'] = (int) Db::i()->select( 'count(*)', 'downloads_view_method' )->first();
 		return $data;
 	}
@@ -53,6 +57,11 @@ class StoreMemberViews extends QueueAbstract
 	 */
 	public function run( array &$data, int $offset ): int
 	{
+		if( !Db::i()->checkForTable( 'downloads_view_method'))
+		{
+			throw new QueueOutOfRangeException;
+		}
+		
 		$rows = iterator_to_array(
 			Db::i()->select( '*', 'downloads_view_method', null, 'member_id', [ $offset, REBUILD_NORMAL] )
 		);
@@ -102,6 +111,6 @@ class StoreMemberViews extends QueueAbstract
 	 */
 	public function postComplete( array $data, bool $processed = TRUE ) : void
 	{
-		Db::i()->dropTable( 'downloads_view_method' );
+		Db::i()->dropTable( 'downloads_view_method', true );
 	}
 }