Version 5.0.0 beta 1

applications/gallery/extensions/core/Statistics/Bandwidth.php

@@ -11,31 +11,43 @@
 namespace IPS\gallery\extensions\core\Statistics;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+
+use IPS\DateTime;
+use IPS\gallery\Image;
+use IPS\Helpers\Chart;
+use IPS\Helpers\Chart\Database;
+use IPS\Http\Url;
+use IPS\Member;
+use IPS\Output\Plugin\Filesize;
+use IPS\Theme;
+use OutOfRangeException;
+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;
 }
 
 /**
  * Statistics Chart Extension
  */
-class _Bandwidth extends \IPS\core\Statistics\Chart
+class Bandwidth extends \IPS\core\Statistics\Chart
 {
 	/**
 	 * @brief	Controller
 	 */
-	public $controller = 'gallery_stats_bandwidth';
+	public ?string $controller = 'gallery_stats_bandwidth';
 	
 	/**
 	 * Render Chart
 	 *
-	 * @param	\IPS\Http\Url	$url	URL the chart is being shown on.
-	 * @return \IPS\Helpers\Chart
+	 * @param	Url	$url	URL the chart is being shown on.
+	 * @return Chart
 	 */
-	public function getChart( \IPS\Http\Url $url ): \IPS\Helpers\Chart
+	public function getChart( Url $url ): Chart
 	{
-		$chart = new \IPS\Helpers\Chart\Database( \IPS\Http\Url::internal( "app=gallery&module=stats&controller=bandwidth" ), 'gallery_bandwidth', 'bdate', '', array( 
+		$chart = new Database( Url::internal( "app=gallery&module=stats&controller=bandwidth" ), 'gallery_bandwidth', 'bdate', '', array(
 			'backgroundColor' 	=> '#ffffff',
 			'colors'			=> array( '#10967e' ),
 			'hAxis'				=> array( 'gridlines' => array( 'color' => '#f5f5f5' ) ),
@@ -43,47 +55,47 @@ class _Bandwidth extends \IPS\core\Statistics\Chart
 			'areaOpacity'		=> 0.4,
 			'chartArea'			=> array( 'left' => 120, 'width' => '75%' ),
 			'vAxis' 			=> array( 
-				'title' => \IPS\Member::loggedIn()->language()->addToStack( 'filesize_raw_k' ) 
+				'title' => Member::loggedIn()->language()->addToStack( 'filesize_raw_k' )
 			)
 		), 'AreaChart', 'daily', array( 'start' => 0, 'end' => 0 ), array( 'member_id', 'image_id', 'bdate', 'bsize' ) );
 		$chart->setExtension( $this );
 		
-		$chart->addSeries( \IPS\Member::loggedIn()->language()->addToStack('bandwidth'), 'number', 'ROUND((SUM(bsize)/1024),2)', FALSE );
+		$chart->addSeries( Member::loggedIn()->language()->addToStack('bandwidth'), 'number', 'ROUND((SUM(bsize)/1024),2)', FALSE );
 		
 		$chart->tableParsers = array(
 			'member_id'	=> function( $val )
 			{
-				$member = \IPS\Member::load( $val );
+				$member = Member::load( $val );
 
 				if( $member->member_id )
 				{
-					$url = \IPS\Http\Url::internal( "app=gallery&module=stats&controller=member&do=images&id={$member->member_id}" );
-					return \IPS\Theme::i()->getTemplate( 'global', 'core', 'global' )->basicUrl( $url, FALSE, $member->name );
+					$url = Url::internal( "app=gallery&module=stats&controller=member&do=images&id={$member->member_id}" );
+					return Theme::i()->getTemplate( 'global', 'core', 'global' )->basicUrl( $url, FALSE, $member->name );
 				}
 				else
 				{
-					return \IPS\Member::loggedIn()->language()->addToStack('deleted_member');
+					return Member::loggedIn()->language()->addToStack('deleted_member');
 				}
 			},
 			'image_id'	=> function( $val )
 			{
 				try
 				{
-					$image = \IPS\gallery\Image::load( $val );
-					return \IPS\Theme::i()->getTemplate( 'global', 'core', 'global' )->basicUrl( $image->url(), TRUE, $image->caption );
+					$image = Image::load( $val );
+					return Theme::i()->getTemplate( 'global', 'core', 'global' )->basicUrl( $image->url(), TRUE, $image->caption );
 				}
-				catch ( \OutOfRangeException $e )
+				catch ( OutOfRangeException )
 				{
-					return \IPS\Member::loggedIn()->language()->addToStack('deleted_image');
+					return Member::loggedIn()->language()->addToStack('deleted_image');
 				}
 			},
 			'bdate'	=> function( $val )
 			{
-				return (string) \IPS\DateTime::ts( $val );
+				return (string) DateTime::ts( $val );
 			},
 			'bsize'	=> function( $val )
 			{
-				return \IPS\Output\Plugin\Filesize::humanReadableFilesize( $val );
+				return Filesize::humanReadableFilesize( $val );
 			}
 		);