Version 5.0.0 beta 1

applications/downloads/widgets/topSubmitters.php

@@ -12,40 +12,51 @@
 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\Helpers\Form;
+use IPS\Helpers\Form\Number;
+use IPS\Member;
+use IPS\Output;
+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;
 }
 
 /**
  * topSubmitters Widget
  */
-class _topSubmitters extends \IPS\Widget\PermissionCache
+class topSubmitters extends PermissionCache implements Customizable
 {
 	/**
 	 * @brief	Widget Key
 	 */
-	public $key = 'topSubmitters';
+	public string $key = 'topSubmitters';
 	
 	/**
 	 * @brief	App
 	 */
-	public $app = 'downloads';
+	public string $app = 'downloads';
 		
-	/**
-	 * @brief	Plugin
-	 */
-	public $plugin = '';
+
 
 	/**
 	* 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();
 	}
@@ -53,14 +64,14 @@ class _topSubmitters 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;
  	}
 
@@ -69,7 +80,7 @@ class _topSubmitters extends \IPS\Widget\PermissionCache
 	 *
 	 * @return	string
 	 */
-	public function render()
+	public function render(): string
 	{
 		foreach ( array( 'week' => 'P1W', 'month' => 'P1M', 'year' => 'P1Y', 'all' => NULL ) as $time => $interval )
 		{
@@ -77,7 +88,7 @@ class _topSubmitters extends \IPS\Widget\PermissionCache
 			$intervalWhere = NULL;
 			if ( $interval )
 			{
-				$intervalWhere = array( 'file_submitted>?', \IPS\DateTime::create()->sub( new \DateInterval( $interval ) )->getTimestamp() );
+				$intervalWhere = array( 'file_submitted>?', DateTime::create()->sub( new DateInterval( $interval ) )->getTimestamp() );
 			}
 			
 			/* Get the submitters ordered by their rating */
@@ -86,32 +97,32 @@ class _topSubmitters extends \IPS\Widget\PermissionCache
 			{
 				$where[] = $intervalWhere;
 			}
-			$ratings = iterator_to_array( \IPS\Db::i()->select(
+			$ratings = iterator_to_array( Db::i()->select(
 				'downloads_files.file_submitter, AVG(file_rating) as rating, count(file_id) AS files',
 				'downloads_files',
 				$where,
 				'files DESC, rating DESC',
-				isset( $this->configuration['number_to_show'] ) ? $this->configuration['number_to_show'] : 5, 'file_submitter'
+				$this->configuration['number_to_show'] ?? 5, 'file_submitter'
 			)->setKeyField('file_submitter')->setValueField('rating') );
 			
 			${$time} = array();
 
-			if( \count( $ratings ) )
+			if( count( $ratings ) )
 			{
 				/* Get their file counts */
-				$where = array( array( \IPS\Db::i()->in( 'file_submitter', array_keys( $ratings ) ) ) );
+				$where = array( array( Db::i()->in( 'file_submitter', array_keys( $ratings ) ) ) );
 				if ( $interval )
 				{
 					$where[] = $intervalWhere;
 				}
 				
-				$fileCounts = iterator_to_array( \IPS\Db::i()->select( 'file_submitter, count(*) AS count', 'downloads_files', $where, NULL, NULL, 'file_submitter' )->setKeyField('file_submitter')->setValueField('count') );
+				$fileCounts = iterator_to_array( Db::i()->select( 'file_submitter, count(*) AS count', 'downloads_files', $where, NULL, NULL, 'file_submitter' )->setKeyField('file_submitter')->setValueField('count') );
 							
 				/* Get member data and put it together */
-				foreach( \IPS\Db::i()->select( '*', 'core_members', \IPS\Db::i()->in( 'member_id', array_keys( $ratings ) ) ) as $key => $memberData )
+				foreach( Db::i()->select( '*', 'core_members', Db::i()->in( 'member_id', array_keys( $ratings ) ) ) as $key => $memberData )
 				{
-					${$time}[$key]['member'] = \IPS\Member::constructFromData( $memberData );
-					${$time}[$key]['files']  = isset( $fileCounts[ $memberData['member_id'] ] ) ? $fileCounts[ $memberData['member_id'] ] : 0;
+					${$time}[$key]['member'] = Member::constructFromData( $memberData );
+					${$time}[$key]['files']  = $fileCounts[$memberData['member_id']] ?? 0;
 					${$time}[$key]['rating'] = $ratings[ $memberData['member_id'] ];
 				}
 			}