Version 5.0.0 beta 1

applications/downloads/widgets/topDownloads.php

@@ -12,46 +12,59 @@
 namespace IPS\downloads\widgets;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+
+use DateInterval;
+use IPS\DateTime;
+use IPS\Db;
+use IPS\downloads\Category;
+use IPS\Helpers\Form;
+use IPS\Helpers\Form\Number;
+use IPS\Member;
+use IPS\Output;
+use IPS\Patterns\ActiveRecordIterator;
+use IPS\Theme;
+use IPS\Widget\Customizable;
+use IPS\Widget\PermissionCache;
+use function count;
+use function defined;
+
+if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
 {
-	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
+	header( ( $_SERVER['SERVER_PROTOCOL'] ?? 'HTTP/1.0' ) . ' 403 Forbidden' );
 	exit;
 }
 
 /**
  * topDownloads Widget
  */
-class _topDownloads extends \IPS\Widget\PermissionCache
+class topDownloads extends PermissionCache implements Customizable
 {
 	/**
 	 * @brief	Widget Key
 	 */
-	public $key = 'topDownloads';
+	public string $key = 'topDownloads';
 	
 	/**
 	 * @brief	App
 	 */
-	public $app = 'downloads';
+	public string $app = 'downloads';
 		
-	/**
-	 * @brief	Plugin
-	 */
-	public $plugin = '';
+
 
 	/**
 	 * @brief	Cache Expiration
 	 * @note	We allow this cache to be valid for 48 hours
 	 */
-	public $cacheExpiration = 172800;
+	public int $cacheExpiration = 172800;
 
 	/**
 	* Init the widget
 	*
 	* @return	void
 	*/
-	public function init()
+	public function init(): void
 	{
-		\IPS\Output::i()->cssFiles = array_merge( \IPS\Output::i()->cssFiles, \IPS\Theme::i()->css( 'widgets.css', 'downloads', 'front' ) );
+		Output::i()->cssFiles = array_merge( Output::i()->cssFiles, Theme::i()->css( 'widgets.css', 'downloads', 'front' ) );
 
 		parent::init();
 	}
@@ -59,14 +72,14 @@ class _topDownloads extends \IPS\Widget\PermissionCache
 	/**
 	 * Specify widget configuration
 	 *
-	 * @param	null|\IPS\Helpers\Form	$form	Form object
-	 * @return	\IPS\Helpers\Form
+	 * @param	null|Form	$form	Form object
+	 * @return	Form
 	 */
-	public function configuration( &$form=null )
+	public function configuration( Form &$form=null ): Form
  	{
 		$form = parent::configuration( $form );
  		
-		$form->add( new \IPS\Helpers\Form\Number( 'number_to_show', isset( $this->configuration['number_to_show'] ) ? $this->configuration['number_to_show'] : 5, TRUE ) );
+		$form->add( new Number( 'number_to_show', $this->configuration['number_to_show'] ?? 5, TRUE ) );
 		return $form;
  	}
 
@@ -75,16 +88,16 @@ class _topDownloads extends \IPS\Widget\PermissionCache
 	 *
 	 * @return	string
 	 */
-	public function render()
+	public function render(): string
 	{
 		$categories = array();
 
-		foreach( \IPS\Db::i()->select( 'perm_type_id', 'core_permission_index', array( 'app=? and perm_type=? and (' . \IPS\Db::i()->findInSet( 'perm_' . \IPS\downloads\Category::$permissionMap['read'], \IPS\Member::loggedIn()->groups ) . ' OR ' . 'perm_' . \IPS\downloads\Category::$permissionMap['read'] . '=? )', 'downloads', 'category', '*' ) ) as $category )
+		foreach( Db::i()->select( 'perm_type_id', 'core_permission_index', array( 'app=? and perm_type=? and (' . Db::i()->findInSet( 'perm_' . Category::$permissionMap['read'], Member::loggedIn()->groups ) . ' OR ' . 'perm_' . Category::$permissionMap['read'] . '=? )', 'downloads', 'category', '*' ) ) as $category )
 		{
 			$categories[]	= $category;
 		}
 
-		if( !\count( $categories ) )
+		if( !count( $categories ) )
 		{
 			return '';
 		}
@@ -94,22 +107,22 @@ class _topDownloads extends \IPS\Widget\PermissionCache
 			$where = array( array( 'file_cat IN(' . implode( ',', $categories ) . ')' ) );
 			if ( $interval )
 			{
-				$where[] = array( 'dtime>?', \IPS\DateTime::create()->sub( new \DateInterval( $interval ) )->getTimestamp() );
+				$where[] = array( 'dtime>?', DateTime::create()->sub( new DateInterval( $interval ) )->getTimestamp() );
 			}
 			
 			$ids	= array();
 			$cases	= array();
 
-			foreach( \IPS\Db::i()->select( 'dfid, count(*) AS downloads', 'downloads_downloads', $where, 'downloads DESC', isset( $this->configuration['number_to_show'] ) ? $this->configuration['number_to_show'] : 5, array( 'dfid' ) )->join( 'downloads_files', 'dfid=file_id' ) as $download )
+			foreach( Db::i()->select( 'dfid, count(*) AS downloads', 'downloads_downloads', $where, 'downloads DESC', $this->configuration['number_to_show'] ?? 5, array( 'dfid' ) )->join( 'downloads_files', 'dfid=file_id' ) as $download )
 			{
 				$ids[]		= $download['dfid'];
 				$cases[]	= "WHEN file_id={$download['dfid']} THEN {$download['downloads']}";
 			}
 
-			if( \count( $ids ) )
+			if( count( $ids ) )
 			{
-				$$time = new \IPS\Patterns\ActiveRecordIterator(
-					\IPS\Db::i()->select(
+				$$time = new ActiveRecordIterator(
+					Db::i()->select(
 						'*, CASE ' . implode( ' ', $cases ) . ' END AS file_downloads',
 						'downloads_files',
 						'file_id IN(' . implode( ',', $ids ) . ')',