Version 4.3.0

applications/downloads/extensions/core/CreateMenu/File.php

@@ -30,15 +30,26 @@ class _File
 	 */
 	public function getItems()
 	{		
-		if ( \IPS\downloads\Category::canOnAny( 'add' ) )
+		if ( \IPS\downloads\Category::canOnAny( 'add', NULL, \IPS\Settings::i()->club_nodes_in_apps ? array() : array( array( 'cclub_id IS NULL' ) ) ) )
 		{
-			return array(
-				'file_download' => array(
-					'link' 		=> \IPS\Http\Url::internal( "app=downloads&module=downloads&controller=submit&_new=1", 'front', 'downloads_submit' ),
-					'title' 	=> 'select_category',
-					'extraData'	=> array( 'data-ipsDialog' => true, 'data-ipsDialog-size' => "narrow" )
-				)
-			);
+			if ( !\IPS\Settings::i()->club_nodes_in_apps and $theOnlyNode = \IPS\downloads\Category::theOnlyNode() AND !\IPS\Member::loggedIn()->group['idm_bulk_submit'] )
+			{
+				return array(
+					'file_download' => array(
+						'link' 	=> \IPS\Http\Url::internal( "app=downloads&module=downloads&controller=submit&do=submit&_new=1&category=" . $theOnlyNode->_id, 'front', 'downloads_submit' ),
+					)
+				);
+			}
+			else
+			{
+				return array(
+					'file_download' => array(
+						'link' 		=> \IPS\Http\Url::internal( "app=downloads&module=downloads&controller=submit&_new=1", 'front', 'downloads_submit' ),
+						'title' 	=> 'select_category',
+						'extraData'	=> array( 'data-ipsDialog' => true, 'data-ipsDialog-size' => "narrow" )
+					)
+				);
+			}
 		}
 		
 		

applications/downloads/extensions/core/FileStorage/FileField.php

@@ -62,7 +62,7 @@ class _FileField
 			
 			try
 			{
-				$file = \IPS\File::get( $oldConfiguration ?: 'core_FileField', $cfield[ 'field_' . $field['cf_id'] ] )->move( $storageConfiguration );
+				$file = \IPS\File::get( $oldConfiguration ?: 'downloads_FileField', $cfield[ 'field_' . $field['cf_id'] ] )->move( $storageConfiguration );
 				
 				if ( (string) $file != $cfield[ 'field_' . $field['cf_id'] ] )
 				{
@@ -137,7 +137,7 @@ class _FileField
 			{
 				foreach( \IPS\Db::i()->select( '*', 'downloads_ccontent', array( "field_{$field['cf_id']}<>? OR field_{$field['cf_id']} IS NOT NULL", '' ) ) as $cfield )
 				{
-					\IPS\File::get( 'core_FileField', $cfield[ 'field_' . $field['cf_id'] ] )->delete();
+					\IPS\File::get( 'downloads_FileField', $cfield[ 'field_' . $field['cf_id'] ] )->delete();
 				}
 			}
 			catch( \Exception $e ){}

applications/downloads/extensions/core/IpAddresses/DownloadLog.php

@@ -76,7 +76,7 @@ class _DownloadLog
 				try
 				{
 					$file = \IPS\downloads\File::load( $val );
-					return "<a href='" . $file->url() . "' target='_blank'>" . htmlspecialchars( $file->name, \IPS\HTMLENTITIES, 'UTF-8', FALSE ) . '</a>';
+					return \IPS\Theme::i()->getTemplate( 'global', 'core', 'global' )->basicUrl( $file->url(), TRUE, $file->name );
 				}
 				catch ( \OutOfRangeException $e )
 				{

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

@@ -0,0 +1,143 @@
+<?php
+/**
+ * @brief		Member ACP Profile - Content Statistics Tab: Downloads
+ * @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		30 Nov 2017
+ */
+
+namespace IPS\downloads\extensions\core\MemberACPProfileContentTab;
+
+/* 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	Member ACP Profile - Content Statistics Tab: Downloads
+ */
+class _Downloads extends \IPS\core\MemberACPProfile\Block
+{
+	/**
+	 * Get output
+	 *
+	 * @return	string
+	 */
+	public function output()
+	{
+		$fileCount = \IPS\Db::i()->select( 'COUNT(*)', 'downloads_files', array( 'file_submitter=?', $this->member->member_id ) )->first();
+		$diskspaceUsed = \IPS\Db::i()->select( 'SUM(file_size)', 'downloads_files', array( 'file_submitter=?', $this->member->member_id ) )->first();
+		$numberOfDownloads = \IPS\Db::i()->select( 'COUNT(*)', 'downloads_downloads', array( 'dmid=?', $this->member->member_id ) )->first();
+		$totalDownloads = \IPS\Db::i()->select( 'COUNT(*)', 'downloads_downloads' )->first();
+		$bandwidthUsed = \IPS\Db::i()->select( 'SUM(dsize)', 'downloads_downloads', array( 'dmid=?', $this->member->member_id ) )->first();
+
+		$allFiles = \IPS\Db::i()->select( 'COUNT(*)', 'downloads_files' )->first();
+		$totalFileSize = \IPS\Db::i()->select( 'SUM(file_size)', 'downloads_files' )->first();
+		$totalDownloadSize = \IPS\Db::i()->select( 'SUM(dsize)', 'downloads_downloads' )->first();
+
+		return \IPS\Theme::i()->getTemplate( 'stats', 'downloads' )->information( $this->member, \IPS\Theme::i()->getTemplate( 'global', 'core' )->definitionTable( array(
+			'files_submitted'		=>
+				\IPS\Member::loggedIn()->language()->addToStack('downloads_stat_of_total', FALSE, array( 'sprintf' => array(
+						\IPS\Member::loggedIn()->language()->formatNumber( $fileCount ),
+						\IPS\Member::loggedIn()->language()->formatNumber( ( ( $allFiles ? ( 100 / $allFiles ) : 0 ) * $fileCount ), 2 ) ) )
+				),
+			'diskspace_used'		=>
+				\IPS\Member::loggedIn()->language()->addToStack('downloads_stat_of_total', FALSE, array( 'sprintf' => array(
+						\IPS\Output\Plugin\Filesize::humanReadableFilesize( $diskspaceUsed ),
+						\IPS\Member::loggedIn()->language()->formatNumber( ( ( $totalFileSize ? ( 100 / $totalFileSize ) : 0 ) * $diskspaceUsed ), 2 ) ) )
+				),
+			'average_filesize_downloads'		=>
+				\IPS\Member::loggedIn()->language()->addToStack('downloads_stat_average', FALSE, array( 'sprintf' => array(
+						\IPS\Output\Plugin\Filesize::humanReadableFilesize( \IPS\Db::i()->select( 'AVG(file_size)', 'downloads_files', array( 'file_submitter=?', $this->member->member_id ) )->first() ),
+						\IPS\Output\Plugin\Filesize::humanReadableFilesize( \IPS\Db::i()->select( 'AVG(file_size)', 'downloads_files' )->first() ) ))
+				),
+			'number_of_downloads'	=>
+				\IPS\Member::loggedIn()->language()->addToStack('downloads_stat_of_total_link', FALSE, array( 'htmlsprintf' => array(
+						\IPS\Member::loggedIn()->language()->formatNumber( $numberOfDownloads ),
+						\IPS\Member::loggedIn()->language()->formatNumber( ( ( $totalDownloads ? ( 100 / $totalDownloads ) : 0 ) * $numberOfDownloads ), 2 ),
+						\IPS\Theme::i()->getTemplate( 'stats', 'downloads' )->link( $this->member, 'downloads', 'downloads' ) ) )
+				),
+			'downloads_bandwidth_used'		=>
+				\IPS\Member::loggedIn()->language()->addToStack('downloads_stat_of_total_link', FALSE, array( 'htmlsprintf' => array(
+						\IPS\Output\Plugin\Filesize::humanReadableFilesize( $bandwidthUsed ),
+						\IPS\Member::loggedIn()->language()->formatNumber( ( ( $totalDownloadSize ? ( 100 / $totalDownloadSize ) : 0 ) * $bandwidthUsed ), 2 ),
+						\IPS\Theme::i()->getTemplate( 'stats', 'downloads' )->link( $this->member, 'bandwidth', 'bandwidth_use' ) ) )
+				)
+		) ) );
+	}
+	
+	/**
+	 * Edit Window
+	 *
+	 * @return	string
+	 */
+	public function edit()
+	{
+		switch ( \IPS\Request::i()->chart )
+		{
+			case 'downloads':
+				$downloadsChart = new \IPS\Helpers\Chart\Database( \IPS\Http\Url::internal( "app=core&module=members&controller=members&do=editBlock&block=IPS\\downloads\\extensions\\core\\MemberACPProfileContentTab\\Downloads&id={$this->member->member_id}&chart=downloads&_graph=1" ), 'downloads_downloads', 'dtime', '', array(
+						'backgroundColor' 	=> '#ffffff',
+						'colors'			=> array( '#10967e', '#ea7963', '#de6470', '#6b9dde', '#b09be4', '#eec766', '#9fc973', '#e291bf', '#55c1a6', '#5fb9da' ),
+						'hAxis'				=> array( 'gridlines' => array( 'color' => '#f5f5f5' ) ),
+						'lineWidth'			=> 1,
+						'areaOpacity'		=> 0.4
+					), 'ColumnChart', 'monthly', array( 'start' => 0, 'end' => 0 ), array( 'dfid', 'dtime', 'dsize', 'dua', 'dip' ) );
+				$downloadsChart->where[] = array( 'dmid=?', $this->member->member_id );
+				$downloadsChart->availableTypes = array( 'AreaChart', 'ColumnChart', 'BarChart', 'Table' );
+				$downloadsChart->tableParsers = array(
+					'dfid'	=> function( $val )
+					{
+						try
+						{
+							$file = \IPS\downloads\File::load( $val );
+							return \IPS\Theme::i()->getTemplate( 'global', 'core', 'global' )->basicUrl( $file->url(), TRUE, $file->name );
+						}
+						catch ( \OutOfRangeException $e )
+						{
+							return \IPS\Member::loggedIn()->language()->addToStack('deleted_file');
+						}
+					},
+					'dtime'	=> function( $val )
+					{
+						return (string) \IPS\DateTime::ts( $val );
+					},
+					'dsize'	=> function( $val )
+					{
+						return \IPS\Output\Plugin\Filesize::humanReadableFilesize( $val );
+					},
+					'dua'	=> function( $val )
+					{
+						return (string) \IPS\Http\Useragent::parse( $val );
+					},
+					'dip'	=> function( $val )
+					{
+						return \IPS\Theme::i()->getTemplate( 'global', 'core', 'global' )->basicUrl( \IPS\Http\Url::internal( "app=core&module=members&controller=ip&ip={$val}&tab=downloads_DownloadLog" ), FALSE, $val );
+					}
+				);
+				$downloadsChart->addSeries( \IPS\Member::loggedIn()->language()->addToStack('downloads'), 'number', 'COUNT(*)', FALSE );
+				$output = ( \IPS\Request::i()->isAjax() and isset( \IPS\Request::i()->_graph ) ) ? (string) $downloadsChart : \IPS\Theme::i()->getTemplate( 'stats', 'downloads' )->graphs( (string) $downloadsChart );
+			break;
+		
+			case 'bandwidth_use':
+				$bandwidthChart = new \IPS\Helpers\Chart\Database( \IPS\Http\Url::internal( "app=core&module=members&controller=members&do=editBlock&block=IPS\\downloads\\extensions\\core\\MemberACPProfileContentTab\\Downloads&id={$this->member->member_id}&chart=bandwidth_use&_graph=1" ), 'downloads_downloads', 'dtime', '', array( 
+						'vAxis' => array( 'title' => '(' . \IPS\Member::loggedIn()->language()->addToStack( 'filesize_raw_k' ) . ')' ),
+						'backgroundColor' 	=> '#ffffff',
+						'colors'			=> array( '#10967e', '#ea7963', '#de6470', '#6b9dde', '#b09be4', '#eec766', '#9fc973', '#e291bf', '#55c1a6', '#5fb9da' ),
+						'hAxis'				=> array( 'gridlines' => array( 'color' => '#f5f5f5' ) ),
+						'lineWidth'			=> 1,
+						'areaOpacity'		=> 0.4 
+					) );
+				$bandwidthChart->where[] = array( 'dmid=?', $this->member->member_id );
+				$bandwidthChart->addSeries( \IPS\Member::loggedIn()->language()->addToStack('bandwidth_use'), 'number', 'ROUND((SUM(dsize)/1024),2)', FALSE );
+				$output = ( \IPS\Request::i()->isAjax() and isset( \IPS\Request::i()->_graph ) ) ? (string) $bandwidthChart : \IPS\Theme::i()->getTemplate( 'stats', 'downloads' )->graphs( (string) $bandwidthChart );
+			break;
+		}
+		
+		return $output;
+	}
+}

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

@@ -1,50 +1,3 @@
 <?php
-/**
- * @brief		Admin CP Member Form
- * @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	Downloads
- * @since		13 Dec 2013
- */
 
-namespace IPS\downloads\extensions\core\MemberForm;
-
-/* 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;
-}
-
-/**
- * Admin CP Member Form
- */
-class _Downloads
-{
-	/**
-	 * Process Form
-	 *
-	 * @param	\IPS\Helpers\Form		$form	The form
-	 * @param	\IPS\Member				$member	Existing Member
-	 * @return	void
-	 */
-	public function process( &$form, $member )
-	{		
-		$form->addMessage( "<a href='" . \IPS\Http\Url::internal( 'app=downloads&module=stats&controller=member&do=downloads&id=' . $member->member_id ) . "'>" . \IPS\Member::loggedIn()->language()->addToStack('downloads_stats') . '</a>', '', FALSE );
-		$form->add( new \IPS\Helpers\Form\YesNo( 'idm_block_submissions', !$member->idm_block_submissions ) );
-	}
-	
-	/**
-	 * Save
-	 *
-	 * @param	array				$values	Values from form
-	 * @param	\IPS\Member			$member	The member
-	 * @return	void
-	 */
-	public function save( $values, &$member )
-	{
-		$member->idm_block_submissions = !$values['idm_block_submissions'];	
-	}
-}
+// Removed

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

@@ -0,0 +1,86 @@
+<?php
+/**
+ * @brief		Member Restrictions: Downloads
+ * @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		30 Nov 2017
+ */
+
+namespace IPS\downloads\extensions\core\MemberRestrictions;
+
+/* 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	Member Restrictions: Downloads
+ */
+class _Downloads extends \IPS\core\MemberACPProfile\Restriction
+{
+	/**
+	 * Modify Edit Restrictions form
+	 *
+	 * @param	\IPS\Helpers\Form	$form	The form
+	 * @return	void
+	 */
+	public function form( \IPS\Helpers\Form $form )
+	{
+		$form->add( new \IPS\Helpers\Form\YesNo( 'idm_block_submissions', !$this->member->idm_block_submissions ) );
+	}
+	
+	/**
+	 * Save Form
+	 *
+	 * @param	array	$values	Values from form
+	 * @return	array
+	 */
+	public function save( $values )
+	{
+		$return = array();
+		
+		if ( $this->member->idm_block_submissions == $values['idm_block_submissions'] )
+		{
+			$return['idm_block_submissions'] = array( 'old' => $this->member->members_bitoptions['idm_block_submissions'], 'new' => !$values['idm_block_submissions'] );
+			$this->member->idm_block_submissions = !$values['idm_block_submissions'];	
+		}
+		
+		return $return;
+	}
+	
+	/**
+	 * What restrictions are active on the account?
+	 *
+	 * @return	array
+	 */
+	public function activeRestrictions()
+	{
+		$return = array();
+		
+		if ( $this->member->idm_block_submissions )
+		{
+			$return[] = 'restriction_no_downloads';
+		}
+		
+		return $return;
+	}
+	
+	/**
+	 * Get details of a change to show on history
+	 *
+	 * @param	array	$changes	Changes as set in save()
+	 * @return	array
+	 */
+	public static function changesForHistory( $changes )
+	{
+		if ( isset( $changes['idm_block_submissions'] ) )
+		{
+			return array( \IPS\Member::loggedIn()->language()->addToStack( 'history_restrictions_downloads_' . intval( $changes['idm_block_submissions']['new'] ) ) );
+		}
+		return array();
+	}
+}

applications/downloads/extensions/core/ModeratorPermissions/Files.php

@@ -0,0 +1,73 @@
+<?php
+/**
+ * @brief		Moderator Permissions
+ * @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	Downloads
+ * @since		09 Apr 2018
+ */
+
+namespace IPS\downloads\extensions\core\ModeratorPermissions;
+
+/* 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;
+}
+
+/**
+ * Moderator Permissions
+ */
+class _Files
+{
+	/**
+	 * Get Permissions
+	 *
+	 * @code
+	 	return array(
+	 		'key'	=> 'YesNo',	// Can just return a string with type
+	 		'key'	=> array(	// Or an array for more options
+	 			'YesNo',			// Type
+	 			array( ... ),		// Options (as defined by type's class)
+	 			'prefix',			// Prefix
+	 			'suffix',			// Suffix
+	 		),
+	 		...
+	 	);
+	 * @endcode
+	 * @return	array
+	 */
+	public function getPermissions()
+	{
+		return array(
+			'can_make_purchasable'		=> 'YesNo',
+			'can_make_unpurchasable'	=> 'YesNo'
+		);
+	}
+	
+	/**
+	 * After change
+	 *
+	 * @param	array	$moderator	The moderator
+	 * @param	array	$changed	Values that were changed
+	 * @return	void
+	 */
+	public function onChange( $moderator, $changed )
+	{
+		
+	}
+	
+	/**
+	 * After delete
+	 *
+	 * @param	array	$moderator	The moderator
+	 * @return	void
+	 */
+	public function onDelete( $moderator )
+	{
+		
+	}
+}

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

@@ -0,0 +1,158 @@
+<?php
+/**
+ * @brief		Background Task
+ * @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	Downloads
+ * @since		01 Dec 2017
+ */
+
+namespace IPS\downloads\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
+ */
+class _RebuildScreenshotWatermarks
+{
+	/**
+	 * @brief Number of items to rebuild per cycle
+	 */
+	public $rebuild	= 5;
+
+	/**
+	 * Parse data before queuing
+	 *
+	 * @param	array	$data
+	 * @return	array
+	 */
+	public function preQueueData( $data )
+	{
+		try
+		{
+			$watermark = \IPS\Settings::i()->idm_watermarkpath ? \IPS\File::get( 'core_Theme', \IPS\Settings::i()->idm_watermarkpath )->contents() : NULL;
+			$where = array( array( 'record_type=?', 'ssupload' ) );
+			if ( !$watermark )
+			{
+				$where[] = array( 'record_no_watermark<>?', '' );
+			}
+
+			$data['count']		= \IPS\Db::i()->select( 'MAX(record_id)', 'downloads_files_records', $where )->first();
+			$data['realCount']	= \IPS\Db::i()->select( 'COUNT(*)', 'downloads_files_records', $where )->first();
+		}
+		catch( \Exception $ex )
+		{
+			return NULL;
+		}
+
+		if( $data['count'] == 0 or $data['realCount'] == 0 )
+		{
+			return NULL;
+		}
+
+		$data['indexed']	= 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 )
+	{
+		$last = NULL;
+		$watermark = \IPS\Settings::i()->idm_watermarkpath ? \IPS\Image::create( \IPS\File::get( 'core_Theme', \IPS\Settings::i()->idm_watermarkpath )->contents() ) : NULL;
+
+		$where = array( array( 'record_id>? AND record_type=?', $offset, 'ssupload' ) );
+		if ( !$watermark )
+		{
+			$where[] = array( 'record_no_watermark<>?', '' );
+		}
+
+		$select = \IPS\Db::i()->select( '*', 'downloads_files_records', $where, 'record_id', array( 0, $this->rebuild ) );
+
+		foreach ( $select as $row )
+		{
+			try
+			{
+				if ( $row['record_no_watermark'] )
+				{
+					$original = \IPS\File::get( 'downloads_Screenshots', $row['record_no_watermark'] );
+
+					try
+					{
+						\IPS\File::get( 'downloads_Screenshots', $row['record_location'] )->delete();
+						\IPS\File::get( 'downloads_Screenshots', $row['record_thumb'] )->delete();
+					}
+					catch ( \Exception $e ) { }
+
+					if ( !$watermark )
+					{
+						\IPS\Db::i()->update( 'downloads_files_records', array(
+							'record_location'		=> (string) $original,
+							'record_thumb'			=> (string) $original->thumbnail( 'downloads_Screenshots' ),
+							'record_no_watermark'	=> NULL
+						), array( 'record_id=?', $row['record_id'] ) );
+
+						$data['indexed']++;
+						$last = $row['record_id'];
+
+						continue;
+					}
+				}
+				else
+				{
+					$original = \IPS\File::get( 'downloads_Screenshots', $row['record_location'] );
+				}
+
+				$image = \IPS\Image::create( $original->contents() );
+				$image->watermark( $watermark );
+
+				$newFile = \IPS\File::create( 'downloads_Screenshots', $original->originalFilename, $image );
+
+				\IPS\Db::i()->update( 'downloads_files_records', array(
+					'record_location'		=> (string) $newFile,
+					'record_thumb'			=> (string) $newFile->thumbnail( 'downloads_Screenshots' ),
+					'record_no_watermark'	=> (string) $original
+				), array( 'record_id=?', $row['record_id'] ) );
+			}
+			catch ( \Exception $e ) { }
+
+			$data['indexed']++;
+			$last = $row['record_id'];
+		}
+
+		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('downloads_rebuilding_screenshots'), 'complete' => ( $data['realCount'] * $data['indexed'] ) > 0 ? round( ( $data['realCount'] * $data['indexed'] ) * 100, 2 ) : 0 );
+	}
+}