Version 5.0.0 beta 1

applications/cms/widgets/Rss.php

@@ -12,31 +12,40 @@
 namespace IPS\cms\widgets;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+
+use Exception;
+use IPS\Data\Store;
+use IPS\DateTime;
+use IPS\Helpers\Form;
+use IPS\Helpers\Form\Number;
+use IPS\Helpers\Form\Text;
+use IPS\Http\Url;
+use IPS\Member;
+use IPS\Text\Parser;
+use IPS\Widget\Customizable;
+use IPS\Widget\StaticCache;
+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;
 }
 
 /**
  * Rss Widget
  */
-class _Rss extends \IPS\Widget\StaticCache
+class Rss extends StaticCache implements Customizable
 {
 	/**
 	 * @brief	Widget Key
 	 */
-	public $key = 'Rss';
+	public string $key = 'Rss';
 	
 	/**
 	 * @brief	App
 	 */
-	public $app = 'cms';
-		
-	/**
-	 * @brief	Plugin
-	 */
-	public $plugin = '';
+	public string $app = 'cms';
 
 	/**
 	 * Constructor
@@ -56,20 +65,20 @@ class _Rss extends \IPS\Widget\StaticCache
 		}
 	}
 
-		/**
+	/**
 	 * Specify widget configuration
 	 *
-	 * @param	null|\IPS\Helpers\Form	$form	Form object
-	 * @return	null|\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\Text( 'block_rss_import_title', ( isset( $this->configuration['block_rss_import_title'] ) ? $this->configuration['block_rss_import_title'] : NULL ), TRUE ) );
-		$form->add( new \IPS\Helpers\Form\Url( 'block_rss_import_url', ( isset( $this->configuration['block_rss_import_url'] ) ? $this->configuration['block_rss_import_url'] : NULL ), TRUE ) );
-		$form->add( new \IPS\Helpers\Form\Number( 'block_rss_import_number', ( isset( $this->configuration['block_rss_import_number'] ) ? $this->configuration['block_rss_import_number'] : 5 ), TRUE ) );
-		$form->add( new \IPS\Helpers\Form\Number( 'block_rss_import_cache', ( isset( $this->configuration['block_rss_import_cache'] ) ? $this->configuration['block_rss_import_cache'] : 30 ), TRUE, array(), NULL, NULL, \IPS\Member::loggedIn()->language()->addToStack('block_rss_import_cache_suffix') ) );
+		$form->add( new Text( 'block_rss_import_title', ( $this->configuration['block_rss_import_title'] ?? NULL ), TRUE ) );
+		$form->add( new Form\Url( 'block_rss_import_url', ( $this->configuration['block_rss_import_url'] ?? NULL ), TRUE ) );
+		$form->add( new Number( 'block_rss_import_number', ( $this->configuration['block_rss_import_number'] ?? 5 ), TRUE ) );
+		$form->add( new Number( 'block_rss_import_cache', ( $this->configuration['block_rss_import_cache'] ?? 30 ), TRUE, array(), NULL, NULL, Member::loggedIn()->language()->addToStack('block_rss_import_cache_suffix') ) );
 
 		return $form;
 	}
@@ -80,7 +89,7 @@ class _Rss extends \IPS\Widget\StaticCache
  	 * @param	array	$values	Values from form
  	 * @return	array
  	 */
- 	public function preConfig( $values )
+ 	public function preConfig( array $values ): array
  	{
  		$values['block_rss_import_url'] = (string) $values['block_rss_import_url'];
 
@@ -92,7 +101,7 @@ class _Rss extends \IPS\Widget\StaticCache
 	 *
 	 * @return	string
 	 */
-	public function render()
+	public function render(): string
 	{
 		if ( ! isset( $this->configuration['block_rss_import_url'] ) )
 		{
@@ -101,9 +110,9 @@ class _Rss extends \IPS\Widget\StaticCache
 
 		$key = "cms_rss_import_" . md5( json_encode( $this->configuration ) );
 
-		if ( isset( \IPS\Data\Store::i()->$key ) )
+		if ( isset( Store::i()->$key ) )
 		{
-			$cache = \IPS\Data\Store::i()->$key;
+			$cache = Store::i()->$key;
 
 			if ( isset( $cache['time'] ) and isset( $cache['items'] ) and $cache['time'] > ( time() - ( $this->configuration['block_rss_import_cache'] * 60 ) ) )
 			{
@@ -114,7 +123,7 @@ class _Rss extends \IPS\Widget\StaticCache
 		/* Still here? Best grab the data then */
 		try
 		{
-			$request = \IPS\Http\Url::external( $this->configuration['block_rss_import_url'] )->request()->get();
+			$request = Url::external( $this->configuration['block_rss_import_url'] )->request()->get();
 
 			$i = 0;
 			$items = array();
@@ -126,9 +135,9 @@ class _Rss extends \IPS\Widget\StaticCache
 					{
 						$items[ $guid ] = array(
 							'title'   => $article['title'],
-							'content' => \IPS\Text\Parser::parseStatic( $article['content'], TRUE, NULL, new \IPS\Member ),
+							'content' => Parser::parseStatic( $article['content'], NULL, new Member ),
 							'link'    => (string) $article['link'],
-							'date'    => ( $article['date'] instanceof \IPS\DateTime ) ? $article['date']->getTimestamp() : $article['date']
+							'date'    => ( $article['date'] instanceof DateTime ) ? $article['date']->getTimestamp() : $article['date']
 						);
 					}
 
@@ -141,12 +150,12 @@ class _Rss extends \IPS\Widget\StaticCache
 				}
 			}
 		}
-		catch( \Exception $e )
+		catch( Exception $e )
 		{
 			$items = array();
 		}
 
-		\IPS\Data\Store::i()->$key = array( 'time' => time(), 'items' => $items );
+		Store::i()->$key = array( 'time' => time(), 'items' => $items );
 
 		return $this->output( $items, $this->configuration['block_rss_import_title'] );
 	}