Version 5.0.0 beta 1

applications/cms/widgets/Categories.php

@@ -12,69 +12,72 @@
 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\cms\Databases\Dispatcher;
+use IPS\cms\Pages\Page;
+use IPS\Http\Url;
+use IPS\Widget\PermissionCache;
+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;
 }
 
 /**
  * Categories Widget
  */
-class _Categories extends \IPS\Widget\PermissionCache
+class Categories extends PermissionCache
 {
 	/**
 	 * @brief	Widget Key
 	 */
-	public $key = 'Categories';
+	public string $key = 'Categories';
 	
 	/**
 	 * @brief	App
 	 */
-	public $app = 'cms';
-		
-	/**
-	 * @brief	Plugin
-	 */
-	public $plugin = '';
+	public string $app = 'cms';
 
 	/**
 	 * Render a widget
 	 *
 	 * @return	string
 	 */
-	public function render()
+	public function render(): string
 	{
 		/* If we're not on a Pages page, return nothing */
-		if( !\IPS\cms\Pages\Page::$currentPage )
+		if( !Page::$currentPage )
 		{
 			return '';
 		}
 
 		/* Scope makes it possible for this block to fire before the main block which sets up the dispatcher */
 		$db = NULL;
-		if ( ! \IPS\cms\Databases\Dispatcher::i()->databaseId )
+		if ( ! Dispatcher::i()->databaseId )
 		{
 			try
 			{
-				$db = \IPS\cms\Pages\Page::$currentPage->getDatabase()->id;
+				$db = Page::$currentPage->getDatabase()->id;
 			}
-			catch( \Exception $ex )
+			catch( Exception $ex )
 			{
 
 			}
 		}
 		else
 		{
-			$db = \IPS\cms\Databases\Dispatcher::i()->databaseId;
+			$db = Dispatcher::i()->databaseId;
 		}
 
-		if ( ! \IPS\cms\Pages\Page::$currentPage->full_path or ! $db )
+		if ( ! Page::$currentPage->full_path or ! $db )
 		{
 			return '';
 		}
 
-		$url = \IPS\Http\Url::internal( "app=cms&module=pages&controller=page&path=" . \IPS\cms\Pages\Page::$currentPage->full_path, 'front', 'content_page_path', \IPS\cms\Pages\Page::$currentPage->full_path );
+		$url = Url::internal( "app=cms&module=pages&controller=page&path=" . Page::$currentPage->full_path, 'front', 'content_page_path', Page::$currentPage->full_path );
 
 		return $this->output($url);
 	}