Version 5.0.0 beta 1

applications/core/modules/admin/stats/badges.php

@@ -12,35 +12,55 @@
 namespace IPS\core\modules\admin\stats;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+
+use Exception;
+use IPS\core\Statistics\Chart;
+use IPS\core\Achievements\Badge;
+use IPS\DateTime;
+use IPS\Db;
+use IPS\Dispatcher;
+use IPS\Dispatcher\Controller;
+use IPS\Helpers\Form;
+use IPS\Helpers\Form\DateRange;
+use IPS\Helpers\Table\Db as TableDb;
+use IPS\Http\Url;
+use IPS\Member;
+use IPS\Member\Group;
+use IPS\Output;
+use IPS\Request;
+use IPS\Theme;
+use Throwable;
+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;
 }
 
 /**
  * badges
  */
-class _badges extends \IPS\Dispatcher\Controller
+class badges extends Controller
 {
 	/**
 	 * @brief	Has been CSRF-protected
  	*/
-	public static $csrfProtected = TRUE;
+	public static bool $csrfProtected = TRUE;
 
 	/**
 	 * @brief	Allow MySQL RW separation for efficiency
 	 */
-	public static $allowRWSeparation = TRUE;
+	public static bool $allowRWSeparation = TRUE;
 
 	/**
 	 * Execute
 	 *
 	 * @return	void
 	 */
-	public function execute()
+	public function execute() : void
 	{
-		\IPS\Dispatcher::i()->checkAcpPermission( 'overview_manage' );
+		Dispatcher::i()->checkAcpPermission( 'overview_manage' );
 		parent::execute();
 	}
 
@@ -49,14 +69,14 @@ class _badges extends \IPS\Dispatcher\Controller
 	 *
 	 * @return void
 	 */
-	protected function showBadges()
+	protected function showBadges() : void
 	{
 		$where = [
-			[ 'datetime BETWEEN ? AND ?', \IPS\Request::i()->badgeDateStart, \IPS\Request::i()->badgeDateEnd ],
-			[ 'member_group_id=?', \IPS\Request::i()->member_group_id ]
+			[ 'datetime BETWEEN ? AND ?', Request::i()->badgeDateStart, Request::i()->badgeDateEnd ],
+			[ 'member_group_id=?', Request::i()->member_group_id ]
 		];
 
-		$query = \IPS\Db::i()->select( 'badge, COUNT(*) as count', 'core_member_badges', $where, NULL, NULL, 'badge' )
+		$query = Db::i()->select( 'badge, COUNT(*) as count', 'core_member_badges', $where, NULL, NULL, 'badge' )
 							 ->join( 'core_members', [ 'core_members.member_id=core_member_badges.member' ] );
 
 		$results = [];
@@ -64,13 +84,13 @@ class _badges extends \IPS\Dispatcher\Controller
 		{
 			try
 			{
-				$row['badge'] = \IPS\core\Achievements\Badge::load( $row['badge'] );
+				$row['badge'] = Badge::load( $row['badge'] );
 				$results[] = $row;
 			}
-			catch( \Exception $e ) { }
+			catch( Exception $e ) { }
 		}
 
-		\IPS\Output::i()->output = \IPS\Theme::i()->getTemplate( 'achievements' )->statsBadgeModal( $results );
+		Output::i()->output = Theme::i()->getTemplate( 'achievements' )->statsBadgeModal( $results );
 	}
 	
 	/**
@@ -78,14 +98,14 @@ class _badges extends \IPS\Dispatcher\Controller
 	 *
 	 * @return void
 	 */
-	protected function showMemberBadges()
+	protected function showMemberBadges() : void
 	{
 		$where = [
-			[ 'datetime BETWEEN ? AND ?', \IPS\Request::i()->badgeDateStart, \IPS\Request::i()->badgeDateEnd ],
-			[ 'member_id=?', \IPS\Request::i()->member_id ]
+			[ 'datetime BETWEEN ? AND ?', Request::i()->badgeDateStart, Request::i()->badgeDateEnd ],
+			[ 'member_id=?', Request::i()->member_id ]
 		];
 
-		$query = \IPS\Db::i()->select( 'badge, datetime', 'core_member_badges', $where, NULL, NULL )
+		$query = Db::i()->select( 'badge, datetime', 'core_member_badges', $where )
 							 ->join( 'core_members', [ 'core_members.member_id=core_member_badges.member' ] );
 
 		$results = [];
@@ -93,13 +113,13 @@ class _badges extends \IPS\Dispatcher\Controller
 		{
 			try
 			{
-				$row['badge'] = \IPS\core\Achievements\Badge::load( $row['badge'] );
+				$row['badge'] = Badge::load( $row['badge'] );
 				$results[] = $row;
 			}
-			catch( \Exception $e ) { }
+			catch( Exception $e ) { }
 		}
 
-		\IPS\Output::i()->output = \IPS\Theme::i()->getTemplate( 'achievements' )->statsMemberBadgeModal( $results );
+		Output::i()->output = Theme::i()->getTemplate( 'achievements' )->statsMemberBadgeModal( $results );
 	}
 
 	/**
@@ -107,34 +127,35 @@ class _badges extends \IPS\Dispatcher\Controller
 	 *
 	 * @return	void
 	 */
-	protected function manage()
+	protected function manage() : void
 	{
 		$tabs = array(
 			'type' => 'stats_badges_by_badge',
 			'list' => 'stats_badges_by_group',
 			'member'	=> 'stats_badges_by_member',
 		);
-		\IPS\Request::i()->tab ??= 'type';
-		$activeTab = ( array_key_exists( \IPS\Request::i()->tab, $tabs ) ) ? \IPS\Request::i()->tab : 'type';
+
+		Request::i()->tab ??= 'type';
+		$activeTab = ( array_key_exists( Request::i()->tab, $tabs ) ) ? Request::i()->tab : 'type';
 
 		if ( $activeTab === 'type' )
 		{
-			$chart = \IPS\core\Statistics\Chart::loadFromExtension( 'core', 'Badges' )->getChart( \IPS\Http\Url::internal( 'app=core&module=stats&controller=badges&tab=' . $activeTab ) );
+			$chart = Chart::loadFromExtension( 'core', 'Badges' )->getChart( Url::internal( 'app=core&module=stats&controller=badges&tab=' . $activeTab ) );
 		}
 		elseif ( $activeTab === 'member' )
 		{
 			$start		= NULL;
 			$end		= NULL;
 
-			$defaults = array( 'start' => \IPS\DateTime::create()->setDate( date('Y'), date('m'), 1 ), 'end' => new \IPS\DateTime );
+			$defaults = array( 'start' => DateTime::create()->setDate( date('Y'), date('m'), 1 ), 'end' => new DateTime );
 
-			if( isset( \IPS\Request::i()->badgeDateStart ) AND isset( \IPS\Request::i()->badgeDateEnd ) )
+			if( isset( Request::i()->badgeDateStart ) AND isset( Request::i()->badgeDateEnd ) )
 			{
-				$defaults = array( 'start' => \IPS\DateTime::ts( \IPS\Request::i()->badgeDateStart ), 'end' => \IPS\DateTime::ts( \IPS\Request::i()->badgeDateEnd ) );
+				$defaults = array( 'start' => DateTime::ts( Request::i()->badgeDateStart ), 'end' => DateTime::ts( Request::i()->badgeDateEnd ) );
 			}
 
-			$form = new \IPS\Helpers\Form( $activeTab, 'continue' );
-			$form->add( new \IPS\Helpers\Form\DateRange( 'date', $defaults, TRUE ) );
+			$form = new Form( $activeTab, 'continue' );
+			$form->add( new DateRange( 'date', $defaults, TRUE ) );
 
 			if( $values = $form->values() )
 			{
@@ -156,7 +177,7 @@ class _badges extends \IPS\Dispatcher\Controller
 			}
 
 			/* Create the table */
-			$chart = new \IPS\Helpers\Table\Db( 'core_member_badges', \IPS\Http\Url::internal( 'app=core&module=stats&controller=badges&type=member' ), [ 'datetime BETWEEN ? AND ?', $startTime, $endTime ] );
+			$chart = new TableDb( 'core_member_badges', Url::internal( 'app=core&module=stats&controller=badges&type=member' ), [ 'datetime BETWEEN ? AND ?', $startTime, $endTime ] );
 			$chart->quickSearch = NULL;
 			$chart->selects = [ 'count(*) as count' ];
 			$chart->joins = [
@@ -172,34 +193,34 @@ class _badges extends \IPS\Dispatcher\Controller
 			
 			/* Custom parsers */
 			$chart->parsers = array(
-				'member_id' => function( $val, $row )
+				'member_id' => function( $val )
 				{
-					$member = \IPS\Member::load( $val );
-					return \IPS\Theme::i()->getTemplate( 'global', 'core' )->userPhoto( $member, 'tiny' ) . ' ' . $member->link();
+					$member = Member::load( $val );
+					return Theme::i()->getTemplate( 'global', 'core' )->userPhoto( $member, 'tiny' ) . ' ' . $member->link();
 				},
 				'count' => function( $val, $row ) use( $startTime, $endTime )
 				{
-					return \IPS\Theme::i()->getTemplate( 'achievements' )->statsMemberBadgeCount( $val, $row['member_id'], $startTime, $endTime );
+					return Theme::i()->getTemplate( 'achievements' )->statsMemberBadgeCount( $val, $row['member_id'], $startTime, $endTime );
 				}
 			);
 
-			$formHtml = $form->customTemplate( array( \IPS\Theme::i()->getTemplate( 'stats' ), 'filtersFormTemplate' ) );
-			$chart = \IPS\Theme::i()->getTemplate( 'achievements', 'core' )->statsBadgeWrapper( $formHtml, (string) $chart );
+			$formHtml = $form->customTemplate( array( Theme::i()->getTemplate( 'stats' ), 'filtersFormTemplate' ) );
+			$chart = Theme::i()->getTemplate( 'achievements', 'core' )->statsBadgeWrapper( $formHtml, (string) $chart );
 		}
 		else
 		{
 			$start		= NULL;
 			$end		= NULL;
 
-			$defaults = array( 'start' => \IPS\DateTime::create()->setDate( date('Y'), date('m'), 1 ), 'end' => new \IPS\DateTime );
+			$defaults = array( 'start' => DateTime::create()->setDate( date('Y'), date('m'), 1 ), 'end' => new DateTime );
 
-			if( isset( \IPS\Request::i()->badgeDateStart ) AND isset( \IPS\Request::i()->badgeDateEnd ) )
+			if( isset( Request::i()->badgeDateStart ) AND isset( Request::i()->badgeDateEnd ) )
 			{
-				$defaults = array( 'start' => \IPS\DateTime::ts( \IPS\Request::i()->badgeDateStart ), 'end' => \IPS\DateTime::ts( \IPS\Request::i()->badgeDateEnd ) );
+				$defaults = array( 'start' => DateTime::ts( Request::i()->badgeDateStart ), 'end' => DateTime::ts( Request::i()->badgeDateEnd ) );
 			}
 
-			$form = new \IPS\Helpers\Form( $activeTab, 'continue' );
-			$form->add( new \IPS\Helpers\Form\DateRange( 'date', $defaults, TRUE ) );
+			$form = new Form( $activeTab, 'continue' );
+			$form->add( new DateRange( 'date', $defaults, TRUE ) );
 
 			if( $values = $form->values() )
 			{
@@ -221,7 +242,7 @@ class _badges extends \IPS\Dispatcher\Controller
 			}
 
 			/* Create the table */
-			$chart = new \IPS\Helpers\Table\Db( 'core_member_badges', \IPS\Http\Url::internal( 'app=core&module=stats&controller=badges&type=list' ), [ 'datetime BETWEEN ? AND ?', $startTime, $endTime ] );
+			$chart = new TableDb( 'core_member_badges', Url::internal( 'app=core&module=stats&controller=badges&type=list' ), [ 'datetime BETWEEN ? AND ?', $startTime, $endTime ] );
 			$chart->quickSearch = NULL;
 			$chart->selects = [ 'count(*) as count' ];
 			$chart->joins = [
@@ -236,35 +257,35 @@ class _badges extends \IPS\Dispatcher\Controller
 
 			/* Custom parsers */
 			$chart->parsers = array(
-				'member_group_id' => function( $val, $row )
+				'member_group_id' => function( $val )
 				{
 					try
 					{
-						return \IPS\Member\Group::load( $val )->formattedName;
+						return Group::load( $val )->formattedName;
 					}
-					catch ( \Throwable $e )
+					catch ( Throwable $e )
 					{
-						return \IPS\Member::loggedIn()->language()->addToStack( 'unavailable' );
+						return Member::loggedIn()->language()->addToStack( 'unavailable' );
 					}
 				},
 				'count' => function( $val, $row ) use( $startTime, $endTime )
 				{
-					return \IPS\Theme::i()->getTemplate( 'achievements' )->statsBadgeCount( $val, $row['member_group_id'], $startTime, $endTime );
+					return Theme::i()->getTemplate( 'achievements' )->statsBadgeCount( $val, $row['member_group_id'], $startTime, $endTime );
 				}
 			);
 
-			$formHtml = $form->customTemplate( array( \IPS\Theme::i()->getTemplate( 'stats' ), 'filtersFormTemplate' ) );
-			$chart = \IPS\Theme::i()->getTemplate( 'achievements', 'core' )->statsBadgeWrapper( $formHtml, (string) $chart );
+			$formHtml = $form->customTemplate( array( Theme::i()->getTemplate( 'stats' ), 'filtersFormTemplate' ) );
+			$chart = Theme::i()->getTemplate( 'achievements', 'core' )->statsBadgeWrapper( $formHtml, (string) $chart );
 		}
 
-		if ( \IPS\Request::i()->isAjax() )
+		if ( Request::i()->isAjax() )
 		{
-			\IPS\Output::i()->output = (string)$chart;
+			Output::i()->output = (string)$chart;
 		}
 		else
 		{
-			\IPS\Output::i()->title = \IPS\Member::loggedIn()->language()->addToStack( 'menu__core_stats_badges' );
-			\IPS\Output::i()->output = \IPS\Theme::i()->getTemplate( 'global', 'core' )->tabs( $tabs, $activeTab, (string)$chart, \IPS\Http\Url::internal( "app=core&module=stats&controller=badges" ), 'tab', '', 'ipsPad' );
+			Output::i()->title = Member::loggedIn()->language()->addToStack( 'menu__core_stats_badges' );
+			Output::i()->output = Theme::i()->getTemplate( 'global', 'core' )->tabs( $tabs, $activeTab, (string)$chart, Url::internal( "app=core&module=stats&controller=badges" ), 'tab', '', 'i-padding_3' );
 		}
 	}
 }

applications/core/modules/admin/stats/deviceusage.php

@@ -11,35 +11,49 @@
 namespace IPS\core\modules\admin\stats;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+
+use IPS\core\Statistics\Chart;
+use IPS\Dispatcher;
+use IPS\Dispatcher\Controller;
+use IPS\Helpers\Form;
+use IPS\Helpers\Form\Interval;
+use IPS\Http\Url;
+use IPS\Member;
+use IPS\Output;
+use IPS\Session;
+use IPS\Settings;
+use IPS\Theme;
+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;
 }
 
 /**
  * Device usage
  */
-class _deviceusage extends \IPS\Dispatcher\Controller
+class deviceusage extends Controller
 {
 	/**
 	 * @brief	Has been CSRF-protected
 	 */
-	public static $csrfProtected = TRUE;
+	public static bool $csrfProtected = TRUE;
 
 	/**
 	 * @brief	Allow MySQL RW separation for efficiency
 	 */
-	public static $allowRWSeparation = TRUE;
+	public static bool $allowRWSeparation = TRUE;
 	
 	/**
 	 * Execute
 	 *
 	 * @return	void
 	 */
-	public function execute()
+	public function execute() : void
 	{
-		\IPS\Dispatcher::i()->checkAcpPermission( 'deviceusage_manage' );
+		Dispatcher::i()->checkAcpPermission( 'deviceusage_manage' );
 		parent::execute();
 	}
 
@@ -48,19 +62,20 @@ class _deviceusage extends \IPS\Dispatcher\Controller
 	 *
 	 * @return	void
 	 */
-	protected function manage()
+	protected function manage() : void
 	{
 		/* Show button to adjust settings */
-		\IPS\Output::i()->sidebar['actions']['settings'] = array(
+		Output::i()->sidebar['actions']['settings'] = array(
 			'icon'		=> 'cog',
 			'title'		=> 'prunesettings',
-			'link'		=> \IPS\Http\Url::internal( 'app=core&module=stats&controller=deviceusage&do=settings' ),
-			'data'		=> array( 'ipsDialog' => '', 'ipsDialog-title' => \IPS\Member::loggedIn()->language()->addToStack('prunesettings') )
+			'link'		=> Url::internal( 'app=core&module=stats&controller=deviceusage&do=settings' ),
+			'data'		=> array( 'ipsDialog' => '', 'ipsDialog-title' => Member::loggedIn()->language()->addToStack('prunesettings') )
 		);
 
-		$chart = \IPS\core\Statistics\Chart::loadFromExtension( 'core', 'DeviceUsage' )->getChart( \IPS\Http\Url::internal( "app=core&module=stats&controller=deviceusage" ) );
-		\IPS\Output::i()->title		= \IPS\Member::loggedIn()->language()->addToStack('menu__core_stats_deviceusage');
-		\IPS\Output::i()->output	= (string) $chart;
+		$chart = Chart::loadFromExtension( 'core', 'DeviceUsage' )->getChart( Url::internal( "app=core&module=stats&controller=deviceusage" ) );
+
+		Output::i()->title		= Member::loggedIn()->language()->addToStack('menu__core_stats_deviceusage');
+		Output::i()->output	= (string) $chart;
 	}
 
 	/**
@@ -68,19 +83,19 @@ class _deviceusage extends \IPS\Dispatcher\Controller
 	 *
 	 * @return	void
 	 */
-	protected function settings()
+	protected function settings() : void
 	{
-		$form = new \IPS\Helpers\Form;
-		$form->add( new \IPS\Helpers\Form\Interval( 'stats_device_usage_prune', \IPS\Settings::i()->stats_device_usage_prune, FALSE, array( 'valueAs' => \IPS\Helpers\Form\Interval::DAYS, 'unlimited' => 0, 'unlimitedLang' => 'never' ), NULL, \IPS\Member::loggedIn()->language()->addToStack('after'), NULL, 'prune_log_moderator' ) );
+		$form = new Form;
+		$form->add( new Interval( 'stats_device_usage_prune', Settings::i()->stats_device_usage_prune, FALSE, array( 'valueAs' => Interval::DAYS, 'unlimited' => 0, 'unlimitedLang' => 'never' ), NULL, Member::loggedIn()->language()->addToStack('after'), NULL, 'prune_log_moderator' ) );
 	
 		if ( $values = $form->values() )
 		{
 			$form->saveAsSettings();
-			\IPS\Session::i()->log( 'acplog__statsonlineusers_settings' );
-			\IPS\Output::i()->redirect( \IPS\Http\Url::internal( 'app=core&module=stats&controller=deviceusage' ), 'saved' );
+			Session::i()->log( 'acplog__statsonlineusers_settings' );
+			Output::i()->redirect( Url::internal( 'app=core&module=stats&controller=deviceusage' ), 'saved' );
 		}
 	
-		\IPS\Output::i()->title		= \IPS\Member::loggedIn()->language()->addToStack('prunesettings');
-		\IPS\Output::i()->output 	= \IPS\Theme::i()->getTemplate('global')->block( 'prunesettings', $form, FALSE );
+		Output::i()->title		= Member::loggedIn()->language()->addToStack('prunesettings');
+		Output::i()->output 	= Theme::i()->getTemplate('global')->block( 'prunesettings', $form, FALSE );
 	}
 }

applications/core/modules/admin/stats/follow.php

@@ -12,22 +12,36 @@
 namespace IPS\core\modules\admin\stats;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+
+use IPS\Db;
+use IPS\Dispatcher;
+use IPS\Dispatcher\Controller;
+use IPS\Http\Url;
+use IPS\Member;
+use IPS\Output;
+use IPS\Request;
+use IPS\Theme;
+use UnderflowException;
+use function count;
+use function defined;
+use function intval;
+
+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;
 }
 
 /**
  * follow
  */
-class _follow extends \IPS\Dispatcher\Controller
+class follow extends Controller
 {
 	
 	/**
 	 * @brief	Has been CSRF-protected
 	 */
-	public static $csrfProtected = TRUE;
+	public static bool $csrfProtected = TRUE;
 	
 	/**
 	 * @brief	Number of results per page
@@ -39,9 +53,9 @@ class _follow extends \IPS\Dispatcher\Controller
 	 *
 	 * @return	void
 	 */
-	public function execute()
+	public function execute() : void
 	{
-		\IPS\Dispatcher::i()->checkAcpPermission( 'follow_manage' );
+		Dispatcher::i()->checkAcpPermission( 'follow_manage' );
 		parent::execute();
 	}
 
@@ -50,17 +64,17 @@ class _follow extends \IPS\Dispatcher\Controller
 	 *
 	 * @return	void
 	 */
-	protected function manage()
+	protected function manage() : void
 	{
 		$tabs		= array(
 			'followers'		=> 'stats_followers_title',
 			'following'		=> 'stats_following_title',
 		);
-		$activeTab	= ( isset( \IPS\Request::i()->tab ) and array_key_exists( \IPS\Request::i()->tab, $tabs ) ) ? \IPS\Request::i()->tab : 'followers';
+		$activeTab	= ( isset( Request::i()->tab ) and array_key_exists( Request::i()->tab, $tabs ) ) ? Request::i()->tab : 'followers';
 
 		$where = array( 'core_follow.follow_app=? and core_follow.follow_area=?', 'core', 'member' );
 		
-		$page = isset( \IPS\Request::i()->page ) ? \intval( \IPS\Request::i()->page ) : 1;
+		$page = isset( Request::i()->page ) ? intval( Request::i()->page ) : 1;
 
 		if( $page < 1 )
 		{
@@ -71,16 +85,16 @@ class _follow extends \IPS\Dispatcher\Controller
 		
 		try
 		{
-			$total = \IPS\Db::i()->select( 'COUNT(DISTINCT(core_follow.' . $column . '))', 'core_follow', $where )->join( 'core_members', 'core_members.member_id = core_follow.' . $column )->first();
+			$total = Db::i()->select( 'COUNT(DISTINCT(core_follow.' . $column . '))', 'core_follow', $where )->join( 'core_members', 'core_members.member_id = core_follow.' . $column )->first();
 		}
-		catch ( \UnderflowException $e )
+		catch ( UnderflowException $e )
 		{
 			$total = 0;
 		}
 
 		if( $total )
 		{
-			$select	= \IPS\Db::i()->select( 'core_follow.' . $column . ', count(*) as count', 'core_follow', $where, 'count DESC', array( ( $page - 1 ) * static::PER_PAGE, static::PER_PAGE ), $column )->join( 'core_members', 'core_members.member_id = core_follow.' . $column );
+			$select	= Db::i()->select( 'core_follow.' . $column . ', count(*) as count', 'core_follow', $where, 'count DESC', array( ( $page - 1 ) * static::PER_PAGE, static::PER_PAGE ), $column )->join( 'core_members', 'core_members.member_id = core_follow.' . $column );
 			$mids = array();
 			
 			foreach( $select as $row )
@@ -90,34 +104,34 @@ class _follow extends \IPS\Dispatcher\Controller
 
 			$members = array();
 
-			if ( \count( $mids ) )
+			if ( count( $mids ) )
 			{
-				$members = iterator_to_array( \IPS\Db::i()->select( '*', 'core_members', array( \IPS\Db::i()->in( 'member_id', $mids ) ) )->setKeyField('member_id') );
+				$members = iterator_to_array( Db::i()->select( '*', 'core_members', array( Db::i()->in( 'member_id', $mids ) ) )->setKeyField('member_id') );
 			}
 
-			$pagination = \IPS\Theme::i()->getTemplate( 'global', 'core', 'global' )->pagination(
-				\IPS\Http\Url::internal( 'app=core&module=stats&controller=follow' ),
+			$pagination = Theme::i()->getTemplate( 'global', 'core', 'global' )->pagination(
+				Url::internal( 'app=core&module=stats&controller=follow' ),
 				ceil( $total / static::PER_PAGE ),
 				$page,
 				static::PER_PAGE,
 				FALSE
 			);
 
-			$output = \IPS\Theme::i()->getTemplate('stats' )->topFollow( $select, $pagination, $members, $total, $column, $activeTab );
+			$output = Theme::i()->getTemplate('stats' )->topFollow( $select, $pagination, $members, $total, $column, $activeTab );
 		}
 		else
 		{
-			$output= \IPS\Theme::i()->getTemplate( 'global', 'core' )->block( NULL, \IPS\Member::loggedIn()->language()->addToStack('no_results'), FALSE , 'ipsPad', NULL, TRUE );
+			$output= Theme::i()->getTemplate( 'global', 'core' )->block( NULL, Member::loggedIn()->language()->addToStack('no_results'), FALSE , 'i-padding_3', NULL, TRUE );
 		}
 		
-		if ( \IPS\Request::i()->isAjax() )
+		if ( Request::i()->isAjax() )
 		{
-			\IPS\Output::i()->output = \IPS\Theme::i()->getTemplate( 'global' )->paddedBlock( $output, NULL, "ipsPad" );
+			Output::i()->output = Theme::i()->getTemplate( 'global' )->paddedBlock( $output, NULL, "i-padding_3" );
 		}
 		else
 		{	
-			\IPS\Output::i()->title = \IPS\Member::loggedIn()->language()->addToStack( 'menu__core_stats_follow' );
-			\IPS\Output::i()->output = \IPS\Theme::i()->getTemplate( 'global', 'core' )->tabs( $tabs, $activeTab, $output, \IPS\Http\Url::internal( "app=core&module=stats&controller=follow" ), 'tab', '', 'ipsPad' );
+			Output::i()->title = Member::loggedIn()->language()->addToStack( 'menu__core_stats_follow' );
+			Output::i()->output = Theme::i()->getTemplate( 'global', 'core' )->tabs( $tabs, $activeTab, $output, Url::internal( "app=core&module=stats&controller=follow" ), 'tab', '', 'i-padding_3' );
 		}
 			
 	}

applications/core/modules/admin/stats/helpful.php

@@ -0,0 +1,207 @@
+<?php
+/**
+ * @brief		helpful
+ * @author		<a href='https://www.invisioncommunity.com'>Invision Power Services, Inc.</a>
+ * @copyright	(c) Invision Power Services, Inc.
+ * @license		https://www.invisioncommunity.com/legal/standards/
+ * @package		Invision Community
+
+ * @since		16 Jul 2023
+ */
+
+namespace IPS\core\modules\admin\stats;
+
+/* To prevent PHP errors (extending class does not exist) revealing path */
+
+use IPS\DateTime;
+use IPS\Db;
+use IPS\Dispatcher;
+use IPS\Dispatcher\Controller;
+use IPS\Helpers\Form;
+use IPS\Helpers\Form\DateRange;
+use IPS\Http\Url;
+use IPS\Member;
+use IPS\Output;
+use IPS\Request;
+use IPS\Theme;
+use UnderflowException;
+use function defined;
+
+if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+{
+	header( ( $_SERVER['SERVER_PROTOCOL'] ?? 'HTTP/1.0' ) . ' 403 Forbidden' );
+	exit;
+}
+
+/**
+ * helpful
+ */
+class helpful extends Controller
+{
+	/**
+	 * @brief	Number of results per page
+	 */
+	const PER_PAGE = 25;
+
+	/**
+	 * Execute
+	 *
+	 * @return	void
+	 */
+	public function execute() : void
+	{
+		Dispatcher::i()->checkAcpPermission( 'helpful_manage' );
+		parent::execute();
+	}
+
+	/**
+	 * Manage
+	 *
+	 * @return	void
+	 */
+	protected function manage() : void
+	{
+		$tabs		= array(
+			'solved'		=> 'stats_helpful_solved',
+			'helpful'		=> 'stats_helpful_helpful',
+		);
+		Request::i()->tab ??= 'solved';
+		$activeTab	= ( isset( Request::i()->tab ) and array_key_exists( Request::i()->tab, $tabs ) ) ? Request::i()->tab : 'solved';
+
+		switch( $activeTab )
+		{
+			case 'helpful':
+				 $output = $this->_output( 'helpful' );
+				break;
+
+			default:
+				$output = $this->_output( 'solved' );
+				break;
+		}
+
+		$params = array(
+			'start' => Request::i()->start,
+			'end' => Request::i()->end,
+		);
+
+		if ( Request::i()->isAjax() )
+		{
+			Output::i()->output = Theme::i()->getTemplate( 'global' )->paddedBlock( $output, NULL, "i-padding_3" );
+		}
+		else
+		{
+			Output::i()->title = Member::loggedIn()->language()->addToStack('menu__core_stats_helpful');
+			Output::i()->output = Theme::i()->getTemplate( 'global', 'core' )->tabs( $tabs, $activeTab, $output, Url::internal( "app=core&module=stats&controller=helpful" )->setQueryString( $params ), 'tab', '', 'i-padding_3' );
+		}
+	}
+
+	/**
+	 * Output for tab
+	 *
+	 * @param string $type
+	 * @return	string
+	 */
+	public function _output( string $type='solved' ): string
+	{
+		$where = array();
+		if ( isset( Request::i()->form ) )
+		{
+			$form = new Form( 'form', 'go' );
+
+			$default = array(
+				'start' => Request::i()->start ? DateTime::ts( Request::i()->start ) : NULL,
+				'end' => Request::i()->end ? DateTime::ts( Request::i()->end ) : NULL
+			);
+
+			$form->add( new DateRange( 'stats_date_range', $default, FALSE, array( 'start' => array( 'max' => DateTime::ts( time() )->setTime( 0, 0, 0 ), 'time' => FALSE ), 'end' => array( 'max' => DateTime::ts( time() )->setTime( 23, 59, 59 ), 'time' => FALSE ) ) ) );
+
+			if ( !$values = $form->values() )
+			{
+				return (string) $form;
+			}
+		}
+
+		/* Figure out start and end parameters for links */
+		$params = array(
+			'start' => !empty( $values['stats_date_range']['start'] ) ? $values['stats_date_range']['start']->getTimestamp() : Request::i()->start,
+			'end' => !empty( $values['stats_date_range']['end'] ) ? $values['stats_date_range']['end']->getTimestamp() : Request::i()->end,
+			'tab' => $type
+		);
+
+		Request::i()->start = $params['start'];
+		Request::i()->end = $params['end'];
+
+		if( $params['start'] )
+		{
+			$where[] = array( 'solved_date>?', $params['start'] );
+		}
+
+		if( $params['end'] )
+		{
+			$where[] = array( 'solved_date<?', $params['end'] );
+		}
+
+		$where[] = [ 'hidden=0' ];
+
+		$page = isset( Request::i()->page ) ? intval( Request::i()->page ) : 1;
+
+		if( $page < 1 )
+		{
+			$page = 1;
+		}
+
+		$where[] = [ 'type=?', $type ];
+		try
+		{
+			$total = Db::i()->select( 'COUNT(DISTINCT(core_solved_index.member_id))', 'core_solved_index', $where )->join( 'core_members', 'core_members.member_id = core_solved_index.member_id')->first();
+		}
+		catch ( UnderflowException $e )
+		{
+			$total = 0;
+		}
+
+		if( $total )
+		{
+			$select	= Db::i()->select( 'core_solved_index.member_id as member_id, count(*) as count', 'core_solved_index', $where, 'count DESC', array( ( $page - 1 ) * static::PER_PAGE, static::PER_PAGE ), 'member_id' )->join( 'core_members', 'core_members.member_id = core_solved_index.member_id');
+			$mids = array();
+
+			foreach( $select as $row )
+			{
+				$mids[] = $row['member_id'];
+			}
+
+			$members = array();
+
+			if ( count( $mids ) )
+			{
+				$members = iterator_to_array( Db::i()->select( '*', 'core_members', array( Db::i()->in( 'member_id', $mids ) ) )->setKeyField('member_id') );
+			}
+
+			$pagination = Theme::i()->getTemplate( 'global', 'core', 'global' )->pagination(
+				Url::internal( 'app=core&module=stats&controller=helpful' )->setQueryString( $params ),
+				ceil( $total / static::PER_PAGE ),
+				$page,
+				static::PER_PAGE,
+				FALSE
+			);
+
+			Output::i()->sidebar['actions'] = array(
+				'settings'	=> array(
+					'title'		=> 'stats_date_range',
+					'icon'		=> 'calendar',
+					'link'		=> Url::internal( 'app=core&module=stats&controller=helpful&form=1' )->setQueryString( $params ),
+					'data'		=> array( 'ipsDialog' => '', 'ipsDialog-title' => Member::loggedIn()->language()->addToStack('stats_date_range') )
+				)
+			);
+
+			$output = Theme::i()->getTemplate('stats' )->helpful( $select, $pagination, $members, $total );
+		}
+		else
+		{
+			/* Return the no results message */
+			$output = Theme::i()->getTemplate( 'global', 'core' )->block( Member::loggedIn()->language()->addToStack('menu__core_stats_helpful'), Member::loggedIn()->language()->addToStack('no_results'), FALSE , 'i-padding_3', NULL, FALSE );
+		}
+
+		return $output;
+	}
+}

applications/core/modules/admin/stats/membersactivity.php

@@ -11,35 +11,53 @@
 namespace IPS\core\modules\admin\stats;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+
+use IPS\DateTime;
+use IPS\Dispatcher;
+use IPS\Dispatcher\Controller;
+use IPS\Helpers\Form;
+use IPS\Helpers\Form\CheckboxSet;
+use IPS\Helpers\Form\DateRange;
+use IPS\Helpers\Table\Db;
+use IPS\Http\Url;
+use IPS\Member;
+use IPS\Member\Group;
+use IPS\Output;
+use IPS\Request;
+use IPS\Theme;
+use function count;
+use function defined;
+use function is_array;
+
+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;
 }
 
 /**
  * Member Activity
  */
-class _membersactivity extends \IPS\Dispatcher\Controller
+class membersactivity extends Controller
 {
 	/**
 	 * @brief	Has been CSRF-protected
 	 */
-	public static $csrfProtected = TRUE;
+	public static bool $csrfProtected = TRUE;
 
 	/**
 	 * @brief	Allow MySQL RW separation for efficiency
 	 */
-	public static $allowRWSeparation = TRUE;
+	public static bool $allowRWSeparation = TRUE;
 	
 	/**
 	 * Execute
 	 *
 	 * @return	void
 	 */
-	public function execute()
+	public function execute() : void
 	{
-		\IPS\Dispatcher::i()->checkAcpPermission( 'membersactivity_manage' );
+		Dispatcher::i()->checkAcpPermission( 'membersactivity_manage' );
 		parent::execute();
 	}
 
@@ -48,7 +66,7 @@ class _membersactivity extends \IPS\Dispatcher\Controller
 	 *
 	 * @return	void
 	 */
-	protected function manage()
+	protected function manage() : void
 	{
 		
 		$tabs = array(
@@ -56,34 +74,34 @@ class _membersactivity extends \IPS\Dispatcher\Controller
 			'inactive' => 'stats_activity_inactive',
 		);
 
-		$activeTab = ( isset( \IPS\Request::i()->tab ) and array_key_exists( \IPS\Request::i()->tab, $tabs ) ) ? \IPS\Request::i()->tab : 'overview';
+		$activeTab = ( isset( Request::i()->tab ) and array_key_exists( Request::i()->tab, $tabs ) ) ? Request::i()->tab : 'overview';
 
 		$count		= NULL;
 		$table		= NULL;
 		$start		= NULL;
 		$end		= NULL;
 
-		$defaults = array( 'start' => \IPS\DateTime::create()->setDate( date('Y'), date('m'), 1 ), 'end' => new \IPS\DateTime );
+		$defaults = array( 'start' => DateTime::create()->setDate( date('Y'), date('m'), 1 ), 'end' => new DateTime );
 
-		if( isset( \IPS\Request::i()->postDateStart ) AND isset( \IPS\Request::i()->postDateEnd ) )
+		if( isset( Request::i()->postDateStart ) AND isset( Request::i()->postDateEnd ) )
 		{
-			$defaults = array( 'start' => \IPS\DateTime::ts( \IPS\Request::i()->postDateStart ), 'end' => \IPS\DateTime::ts( \IPS\Request::i()->postDateEnd ) );
+			$defaults = array( 'start' => DateTime::ts( Request::i()->postDateStart ), 'end' => DateTime::ts( Request::i()->postDateEnd ) );
 		}
 
-		$groupOptions = array_combine( array_keys( \IPS\Member\Group::groups( TRUE, FALSE ) ), array_map( function( $_group ) { return (string) $_group; }, \IPS\Member\Group::groups( TRUE, FALSE ) ) );
+		$groupOptions = array_combine( array_keys( Group::groups( TRUE, FALSE ) ), array_map( function( $_group ) { return (string) $_group; }, Group::groups( TRUE, FALSE ) ) );
 
-		if( isset( \IPS\Request::i()->postGroups ) )
+		if( isset( Request::i()->postGroups ) )
 		{
-			$defaultGroups = explode( ',', \IPS\Request::i()->postGroups );
+			$defaultGroups = explode( ',', Request::i()->postGroups );
 		}
 		else
 		{
 			$defaultGroups = array_keys( $groupOptions );
 		}
 			
-		$form = new \IPS\Helpers\Form( 'posts', 'continue' );
-		$form->add( new \IPS\Helpers\Form\DateRange( 'date', $defaults, TRUE ) );
-		$form->add( new \IPS\Helpers\Form\CheckboxSet( 'groups', $defaultGroups, FALSE, array( 'options' => $groupOptions ), NULL, NULL, NULL, 'group_filters' ) );
+		$form = new Form( 'posts', 'continue' );
+		$form->add( new DateRange( 'date', $defaults, TRUE ) );
+		$form->add( new CheckboxSet( 'groups', $defaultGroups, FALSE, array( 'options' => $groupOptions ), NULL, NULL, NULL, 'group_filters' ) );
 
 		if( $values = $form->values() )
 		{
@@ -94,7 +112,7 @@ class _membersactivity extends \IPS\Dispatcher\Controller
 			$start		= $values['date']['start']->html();
 			$end		= $values['date']['end']->html();
 
-			$groups		= ( \count( array_diff( array_keys( $groupOptions ), $values['groups'] ) ) ) ? $values['groups'] : NULL;
+			$groups		= ( count( array_diff( array_keys( $groupOptions ), $values['groups'] ) ) ) ? $values['groups'] : NULL;
 		}
 		else
 		{
@@ -105,7 +123,7 @@ class _membersactivity extends \IPS\Dispatcher\Controller
 			$start		= $defaults['start']->html();
 			$end		= $defaults['end']->html();
 
-			$groups		= ( \count( array_diff( array_keys( $groupOptions ), $defaultGroups ) ) ) ? $defaultGroups : NULL;
+			$groups		= ( count( array_diff( array_keys( $groupOptions ), $defaultGroups ) ) ) ? $defaultGroups : NULL;
 		}
 
 		/* Do we have our date ranges? */
@@ -131,9 +149,9 @@ class _membersactivity extends \IPS\Dispatcher\Controller
 			$count = \IPS\Db::i()->select( 'COUNT(*)', 'core_members', $where )->first();
 
 			/* And now build the table */
-			$table = new \IPS\Helpers\Table\Db( 'core_members', \IPS\Request::i()->url()->setQueryString( array( 'postDateStart' => $startTime, 'postDateEnd' => $endTime, 'postGroups' => \is_array( $groups ) ? implode( ',', $groups ) : NULL ) ), $where );
+			$table = new Db( 'core_members', Request::i()->url()->setQueryString( array( 'postDateStart' => $startTime, 'postDateEnd' => $endTime, 'postGroups' => is_array( $groups ) ? implode( ',', $groups ) : NULL ) ), $where );
 
-			$table->include		= array( 'name', 'email', 'member_last_post', 'group_name', 'ip_address' );
+			$table->include		= array( 'name', 'email', 'member_posts', 'member_last_post', 'group_name', 'ip_address' );
 			$table->mainColumn	= 'name';
 			$table->langPrefix	= 'activity_';
 			$table->rowClasses	= array( 'email' => array( 'ipsTable_wrap' ), 'group_name' => array( 'ipsTable_wrap' ) );
@@ -147,20 +165,20 @@ class _membersactivity extends \IPS\Dispatcher\Controller
 			$table->parsers = array(
 				'name'			=> function( $val, $row )
 				{
-					$member = \IPS\Member::constructFromData( $row );
-					return \IPS\Theme::i()->getTemplate( 'global', 'core' )->userPhoto( $member, 'tiny' ) . ' ' . $member->link();
+					$member = Member::constructFromData( $row );
+					return Theme::i()->getTemplate( 'global', 'core' )->userPhoto( $member, 'tiny' ) . ' ' . $member->link();
 				},
-				'email'				=> function( $val, $row )
+				'email'				=> function( $val )
 				{
-					return \IPS\Theme::i()->getTemplate( 'members', 'core', 'admin' )->memberEmailCell( htmlentities( $val, ENT_DISALLOWED, 'UTF-8', FALSE ) );				
+					return Theme::i()->getTemplate( 'members', 'core', 'admin' )->memberEmailCell( htmlentities( $val, ENT_DISALLOWED, 'UTF-8', FALSE ) );
 				},
-				'member_last_post'	=> function( $val, $row )
+				'member_last_post'	=> function( $val )
 				{
-					return ( $val ) ? \IPS\DateTime::ts( $val )->html() : \IPS\Member::loggedIn()->language()->addToStack('never');
+					return ( $val ) ? DateTime::ts( $val )->html() : Member::loggedIn()->language()->addToStack('never');
 				},
 				'group_name'	=> function( $val, $row )
 				{
-					$secondary = \IPS\Member::constructFromData( $row )->groups;
+					$secondary = Member::constructFromData( $row )->groups;
 
 					foreach( $secondary as $k => $v )
 					{
@@ -170,39 +188,39 @@ class _membersactivity extends \IPS\Dispatcher\Controller
 							continue;
 						}
 
-						$secondary[ $k ] = \IPS\Member\Group::load( $v );
+						$secondary[ $k ] = Group::load( $v );
 					}
 
-					return \IPS\Theme::i()->getTemplate( 'members', 'core', 'admin' )->groupCell( \IPS\Member\Group::load( $row['member_group_id'] ), $secondary );
+					return Theme::i()->getTemplate( 'members', 'core', 'admin' )->groupCell( Group::load( $row['member_group_id'] ), $secondary );
 				},
-				'ip_address'	=> function( $val, $row )
+				'ip_address'	=> function( $val )
 				{
-					if ( \IPS\Member::loggedIn()->hasAcpRestriction( 'core', 'members', 'membertools_ip' ) )
+					if ( Member::loggedIn()->hasAcpRestriction( 'core', 'members', 'membertools_ip' ) )
 					{
-						return "<a href='" . \IPS\Http\Url::internal( "app=core&module=members&controller=ip&ip={$val}" ) . "'>{$val}</a>";
+						return "<a href='" . Url::internal( "app=core&module=members&controller=ip&ip={$val}" ) . "'>{$val}</a>";
 					}
 					return $val;
 				},
 			);
 
-			$table->extraHtml = \IPS\Theme::i()->getTemplate( 'stats' )->tableheader( $start, $end, $count, ( $activeTab == "overview" ) ? "member_activity_results" : 'member_activity_results_inactive' );
+			$table->extraHtml = Theme::i()->getTemplate( 'stats' )->tableheader( $start, $end, $count, ( $activeTab == "overview" ) ? "member_activity_results" : 'member_activity_results_inactive' );
 		}
 
-		$formHtml = $form->customTemplate( array( \IPS\Theme::i()->getTemplate( 'stats' ), 'filtersFormTemplate' ) );
+		$formHtml = $form->customTemplate( array( Theme::i()->getTemplate( 'stats' ), 'filtersFormTemplate' ) );
 
-		\IPS\Output::i()->jsFiles  = array_merge( \IPS\Output::i()->jsFiles, \IPS\Output::i()->js( 'admin_stats.js', 'core' ) );
+		Output::i()->jsFiles  = array_merge( Output::i()->jsFiles, Output::i()->js( 'admin_stats.js', 'core' ) );
 
-		\IPS\Output::i()->title = \IPS\Member::loggedIn()->language()->addToStack('menu__core_stats_membersactivity');
-		$chart = \IPS\Theme::i()->getTemplate( 'stats' )->memberactivity( $formHtml, $count, $table, $activeTab );
+		Output::i()->title = Member::loggedIn()->language()->addToStack('menu__core_stats_membersactivity');
+		$chart = Theme::i()->getTemplate( 'stats' )->memberactivity( $formHtml, $count, $table, $activeTab );
 
 
-		if ( \IPS\Request::i()->isAjax() )
+		if ( Request::i()->isAjax() )
 		{
-			\IPS\Output::i()->output = (string) $chart;
+			Output::i()->output = (string) $chart;
 		}
 		else
 		{
-			\IPS\Output::i()->output = \IPS\Theme::i()->getTemplate( 'global', 'core' )->tabs( $tabs, $activeTab, (string) $chart, \IPS\Http\Url::internal( "app=core&module=stats&controller=membersactivity" ), 'tab', '', 'ipsPad' );
+			Output::i()->output = Theme::i()->getTemplate( 'global', 'core' )->tabs( $tabs, $activeTab, (string) $chart, Url::internal( "app=core&module=stats&controller=membersactivity" ), 'tab' );
 		}
 		
 		

applications/core/modules/admin/stats/membervisits.php

@@ -11,35 +11,53 @@
 namespace IPS\core\modules\admin\stats;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+
+use IPS\DateTime;
+use IPS\Dispatcher;
+use IPS\Dispatcher\Controller;
+use IPS\Helpers\Form;
+use IPS\Helpers\Form\CheckboxSet;
+use IPS\Helpers\Form\DateRange;
+use IPS\Helpers\Table\Db;
+use IPS\Http\Url;
+use IPS\Member;
+use IPS\Member\Group;
+use IPS\Output;
+use IPS\Request;
+use IPS\Theme;
+use function count;
+use function defined;
+use function is_array;
+
+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;
 }
 
 /**
  * Member visit statistics
  */
-class _membervisits extends \IPS\Dispatcher\Controller
+class membervisits extends Controller
 {
 	/**
 	 * @brief	Has been CSRF-protected
 	 */
-	public static $csrfProtected = TRUE;
+	public static bool $csrfProtected = TRUE;
 
 	/**
 	 * @brief	Allow MySQL RW separation for efficiency
 	 */
-	public static $allowRWSeparation = TRUE;
+	public static bool $allowRWSeparation = TRUE;
 	
 	/**
 	 * Execute
 	 *
 	 * @return	void
 	 */
-	public function execute()
+	public function execute() : void
 	{
-		\IPS\Dispatcher::i()->checkAcpPermission( 'membervisits_manage' );
+		Dispatcher::i()->checkAcpPermission( 'membervisits_manage' );
 		parent::execute();
 	}
 
@@ -48,34 +66,34 @@ class _membervisits extends \IPS\Dispatcher\Controller
 	 *
 	 * @return	void
 	 */
-	protected function manage()
+	protected function manage() : void
 	{
 		$count		= NULL;
 		$table		= NULL;
 		$start		= NULL;
 		$end		= NULL;
 
-		$defaults = array( 'start' => \IPS\DateTime::create()->setDate( date('Y'), date('m'), 1 ), 'end' => new \IPS\DateTime );
+		$defaults = array( 'start' => DateTime::create()->setDate( date('Y'), date('m'), 1 ), 'end' => new DateTime );
 
-		if( isset( \IPS\Request::i()->visitDateStart ) AND isset( \IPS\Request::i()->visitDateEnd ) )
+		if( isset( Request::i()->visitDateStart ) AND isset( Request::i()->visitDateEnd ) )
 		{
-			$defaults = array( 'start' => \IPS\DateTime::ts( \IPS\Request::i()->visitDateStart ), 'end' => \IPS\DateTime::ts( \IPS\Request::i()->visitDateEnd ) );
+			$defaults = array( 'start' => DateTime::ts( Request::i()->visitDateStart ), 'end' => DateTime::ts( Request::i()->visitDateEnd ) );
 		}
 
-		$groupOptions = array_combine( array_keys( \IPS\Member\Group::groups( TRUE, FALSE ) ), array_map( function( $_group ) { return (string) $_group; }, \IPS\Member\Group::groups( TRUE, FALSE ) ) );
+		$groupOptions = array_combine( array_keys( Group::groups( TRUE, FALSE ) ), array_map( function( $_group ) { return (string) $_group; }, Group::groups( TRUE, FALSE ) ) );
 
-		if( isset( \IPS\Request::i()->visitGroups ) )
+		if( isset( Request::i()->visitGroups ) )
 		{
-			$defaultGroups = explode( ',', \IPS\Request::i()->visitGroups );
+			$defaultGroups = explode( ',', Request::i()->visitGroups );
 		}
 		else
 		{
 			$defaultGroups = array_keys( $groupOptions );
 		}
 
-		$form = new \IPS\Helpers\Form( 'visits', 'continue' );
-		$form->add( new \IPS\Helpers\Form\DateRange( 'date', $defaults, TRUE ) );
-		$form->add( new \IPS\Helpers\Form\CheckboxSet( 'groups', $defaultGroups, FALSE, array( 'options' => $groupOptions ), NULL, NULL, NULL, 'group_filters' ) );
+		$form = new Form( 'visits', 'continue' );
+		$form->add( new DateRange( 'date', $defaults, TRUE ) );
+		$form->add( new CheckboxSet( 'groups', $defaultGroups, FALSE, array( 'options' => $groupOptions ), NULL, NULL, NULL, 'group_filters' ) );
 
 		if( $values = $form->values() )
 		{
@@ -86,7 +104,7 @@ class _membervisits extends \IPS\Dispatcher\Controller
 			$start		= $values['date']['start']->html();
 			$end		= $values['date']['end']->html();
 
-			$groups		= ( \count( array_diff( array_keys( $groupOptions ), $values['groups'] ) ) ) ? $values['groups'] : NULL;
+			$groups		= ( count( array_diff( array_keys( $groupOptions ), $values['groups'] ) ) ) ? $values['groups'] : NULL;
 		}
 		else
 		{
@@ -97,7 +115,7 @@ class _membervisits extends \IPS\Dispatcher\Controller
 			$start		= $defaults['start']->html();
 			$end		= $defaults['end']->html();
 
-			$groups		= ( \count( array_diff( array_keys( $groupOptions ), $defaultGroups ) ) ) ? $defaultGroups : NULL;
+			$groups		= ( count( array_diff( array_keys( $groupOptions ), $defaultGroups ) ) ) ? $defaultGroups : NULL;
 		}
 
 		/* Do we have our date ranges? */
@@ -115,7 +133,7 @@ class _membervisits extends \IPS\Dispatcher\Controller
 			$count = \IPS\Db::i()->select( 'COUNT(*)', 'core_members', $where )->first();
 			
 			/* And now build the table */
-			$table = new \IPS\Helpers\Table\Db( 'core_members', \IPS\Request::i()->url()->setQueryString( array( 'visitDateStart' => $startTime, 'visitDateEnd' => $endTime, 'visitGroups' => \is_array( $groups ) ? implode( ',', $groups ) : NULL ) ), $where );
+			$table = new Db( 'core_members', Request::i()->url()->setQueryString( array( 'visitDateStart' => $startTime, 'visitDateEnd' => $endTime, 'visitGroups' => is_array( $groups ) ? implode( ',', $groups ) : NULL ) ), $where );
 
 			$table->include = array( 'name', 'email', 'last_visit', 'group_name', 'ip_address' );
 			$table->mainColumn = 'name';
@@ -130,20 +148,20 @@ class _membervisits extends \IPS\Dispatcher\Controller
 			$table->parsers = array(
 				'name'			=> function( $val, $row )
 				{
-					$member = \IPS\Member::constructFromData( $row );
-					return \IPS\Theme::i()->getTemplate( 'global', 'core' )->userPhoto( $member, 'tiny' ) . ' ' . $member->link();
+					$member = Member::constructFromData( $row );
+					return Theme::i()->getTemplate( 'global', 'core' )->userPhoto( $member, 'tiny' ) . ' ' . $member->link();
 				},
-				'email'				=> function( $val, $row )
+				'email'				=> function( $val )
 				{
-					return \IPS\Theme::i()->getTemplate( 'members', 'core', 'admin' )->memberEmailCell( htmlentities( $val, ENT_DISALLOWED, 'UTF-8', FALSE ) );				
+					return Theme::i()->getTemplate( 'members', 'core', 'admin' )->memberEmailCell( htmlentities( $val, ENT_DISALLOWED, 'UTF-8', FALSE ) );
 				},
-				'last_visit'				=> function( $val, $row )
+				'last_visit'				=> function( $val )
 				{
-					return \IPS\DateTime::ts( $val )->html();
+					return DateTime::ts( $val )->html();
 				},
 				'group_name'	=> function( $val, $row )
 				{
-					$secondary = \IPS\Member::constructFromData( $row )->groups;
+					$secondary = Member::constructFromData( $row )->groups;
 					
 					foreach( $secondary as $k => $v )
 					{
@@ -153,28 +171,28 @@ class _membervisits extends \IPS\Dispatcher\Controller
 							continue;
 						}
 						
-						$secondary[ $k ] = \IPS\Member\Group::load( $v );
+						$secondary[ $k ] = Group::load( $v );
 					}
 
-					return \IPS\Theme::i()->getTemplate( 'members', 'core', 'admin' )->groupCell( \IPS\Member\Group::load( $row['member_group_id'] ), $secondary );
+					return Theme::i()->getTemplate( 'members', 'core', 'admin' )->groupCell( Group::load( $row['member_group_id'] ), $secondary );
 				},
-				'ip_address'	=> function( $val, $row )
+				'ip_address'	=> function( $val )
 				{
-					if ( \IPS\Member::loggedIn()->hasAcpRestriction( 'core', 'members', 'membertools_ip' ) )
+					if ( Member::loggedIn()->hasAcpRestriction( 'core', 'members', 'membertools_ip' ) )
 					{
-						return "<a href='" . \IPS\Http\Url::internal( "app=core&module=members&controller=ip&ip={$val}" ) . "'>{$val}</a>";
+						return "<a href='" . Url::internal( "app=core&module=members&controller=ip&ip={$val}" ) . "'>{$val}</a>";
 					}
 					return $val;
 				},
 			);
 
-			$table->extraHtml = \IPS\Theme::i()->getTemplate( 'stats' )->tableheader( $start, $end, $count, "member_visits_results" );
+			$table->extraHtml = Theme::i()->getTemplate( 'stats' )->tableheader( $start, $end, $count, "member_visits_results" );
 		}
 
-		$formHtml = $form->customTemplate( array( \IPS\Theme::i()->getTemplate( 'stats' ), 'filtersFormTemplate' ) );
+		$formHtml = $form->customTemplate( array( Theme::i()->getTemplate( 'stats' ), 'filtersFormTemplate' ) );
 
-		\IPS\Output::i()->jsFiles  = array_merge( \IPS\Output::i()->jsFiles, \IPS\Output::i()->js( 'admin_stats.js', 'core' ) );
-		\IPS\Output::i()->title = \IPS\Member::loggedIn()->language()->addToStack('menu__core_stats_membervisits');
-		\IPS\Output::i()->output = \IPS\Theme::i()->getTemplate( 'stats' )->membervisits( $formHtml, $count, $table );
+		Output::i()->jsFiles  = array_merge( Output::i()->jsFiles, Output::i()->js( 'admin_stats.js', 'core' ) );
+		Output::i()->title = Member::loggedIn()->language()->addToStack('menu__core_stats_membervisits');
+		Output::i()->output = Theme::i()->getTemplate( 'stats' )->membervisits( $formHtml, $count, $table );
 	}
 }

applications/core/modules/admin/stats/moderators.php

@@ -11,47 +11,45 @@
 
 namespace IPS\core\modules\admin\stats;
 
+/* To prevent PHP errors (extending class does not exist) revealing path */
+
+use IPS\core\Statistics\Chart;
 use IPS\Dispatcher;
 use IPS\Dispatcher\Controller;
-use IPS\Member;
-use IPS\Request;
-use IPS\Output;
-use IPS\Theme;
 use IPS\Http\Url;
-use IPS\core\Statistics\Chart;
-use IPS\Helpers\Table\Db as TableDb;
-
+use IPS\Member;
+use IPS\Output;
+use IPS\Request;
+use IPS\Theme;
 use function defined;
-use function header;
 
-/* To prevent PHP errors (extending class does not exist) revealing path */
 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;
 }
 
 /**
  * moderators
  */
-class _moderators extends Controller
+class moderators extends Controller
 {	
 	/**
 	 * @brief	Has been CSRF-protected
 	 */
-	public static $csrfProtected = TRUE;
+	public static bool $csrfProtected = TRUE;
 	
 	/**
 	 * @brief	Allow MySQL RW separation for efficiency
 	 */
-	public static $allowRWSeparation = TRUE;
-	
+	public static bool $allowRWSeparation = TRUE;
+
 	/**
 	 * Execute
 	 *
 	 * @return	void
 	 */
-	public function execute()
+	public function execute() : void
 	{
 		Dispatcher::i()->checkAcpPermission( 'moderatorstats_manage' );
 		parent::execute();
@@ -62,27 +60,27 @@ class _moderators extends Controller
 	 *
 	 * @return	void
 	 */
-	protected function manage()
+	protected function manage() : void
 	{
 		$tabs = array(
-				'users'				=> 'stats_moderators_users',
-				'actions'			=> 'stats_moderators_actions'
+			'users'				=> 'stats_moderators_users',
+			'actions'			=> 'stats_moderators_actions'
 		);
-		
+
 		Request::i()->tab ??= 'users';
 		$activeTab = ( array_key_exists( Request::i()->tab, $tabs ) ) ? Request::i()->tab : 'users';
-		
+
 		$output = match( $activeTab ) {
 			'users'				=> Chart::loadFromExtension( 'core', 'Moderators' )->getChart( Url::internal( 'app=core&module=stats&controller=moderators&tab=users' ) ),
 			'actions'			=> Chart::loadFromExtension( 'core', 'ModeratorsByAction' )->getChart( Url::internal( "app=core&module=stats&controller=moderators&tab=actions" ) )
 		};
-		
+
 		if ( Request::i()->isAjax() )
 		{
 			Output::i()->output = (string) $output;
 		}
 		else
-		{	
+		{
 			Output::i()->title = Member::loggedIn()->language()->addToStack('menu__core_stats_moderators');
 			Output::i()->output = Theme::i()->getTemplate( 'global', 'core' )->tabs( $tabs, $activeTab, (string) $output, Url::internal( "app=core&module=stats&controller=moderators" ) );
 		}

applications/core/modules/admin/stats/onlineusers.php

@@ -11,35 +11,49 @@
 namespace IPS\core\modules\admin\stats;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+
+use IPS\core\Statistics\Chart;
+use IPS\Dispatcher;
+use IPS\Dispatcher\Controller;
+use IPS\Helpers\Form;
+use IPS\Helpers\Form\Interval;
+use IPS\Http\Url;
+use IPS\Member;
+use IPS\Output;
+use IPS\Session;
+use IPS\Settings;
+use IPS\Theme;
+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;
 }
 
 /**
  * onlineusers
  */
-class _onlineusers extends \IPS\Dispatcher\Controller
+class onlineusers extends Controller
 {
 	/**
 	 * @brief	Has been CSRF-protected
 	 */
-	public static $csrfProtected = TRUE;
+	public static bool $csrfProtected = TRUE;
 
 	/**
 	 * @brief	Allow MySQL RW separation for efficiency
 	 */
-	public static $allowRWSeparation = TRUE;
+	public static bool $allowRWSeparation = TRUE;
 	
 	/**
 	 * Execute
 	 *
 	 * @return	void
 	 */
-	public function execute()
+	public function execute() : void
 	{
-		\IPS\Dispatcher::i()->checkAcpPermission( 'onlineusers_manage' );
+		Dispatcher::i()->checkAcpPermission( 'onlineusers_manage' );
 		parent::execute();
 	}
 
@@ -48,19 +62,20 @@ class _onlineusers extends \IPS\Dispatcher\Controller
 	 *
 	 * @return	void
 	 */
-	protected function manage()
+	protected function manage() : void
 	{
 		/* Show button to adjust settings */
-		\IPS\Output::i()->sidebar['actions']['settings'] = array(
+		Output::i()->sidebar['actions']['settings'] = array(
 			'icon'		=> 'cog',
 			'title'		=> 'prunesettings',
-			'link'		=> \IPS\Http\Url::internal( 'app=core&module=stats&controller=onlineusers&do=settings' ),
-			'data'		=> array( 'ipsDialog' => '', 'ipsDialog-title' => \IPS\Member::loggedIn()->language()->addToStack('prunesettings') )
+			'link'		=> Url::internal( 'app=core&module=stats&controller=onlineusers&do=settings' ),
+			'data'		=> array( 'ipsDialog' => '', 'ipsDialog-title' => Member::loggedIn()->language()->addToStack('prunesettings') )
 		);
 
-		$chart = \IPS\core\Statistics\Chart::loadFromExtension( 'core', 'OnlineUsers' )->getChart( \IPS\Http\Url::internal( "app=core&module=stats&controller=onlineusers" ) );
-		\IPS\Output::i()->title = \IPS\Member::loggedIn()->language()->addToStack('menu__core_stats_onlineusers');
-		\IPS\Output::i()->output	= (string) $chart;
+		$chart = Chart::loadFromExtension( 'core', 'OnlineUsers' )->getChart( Url::internal( "app=core&module=stats&controller=onlineusers" ) );
+
+		Output::i()->title = Member::loggedIn()->language()->addToStack('menu__core_stats_onlineusers');
+		Output::i()->output	= (string) $chart;
 	}
 
 	/**
@@ -68,19 +83,19 @@ class _onlineusers extends \IPS\Dispatcher\Controller
 	 *
 	 * @return	void
 	 */
-	protected function settings()
+	protected function settings() : void
 	{
-		$form = new \IPS\Helpers\Form;
-		$form->add( new \IPS\Helpers\Form\Interval( 'stats_online_users_prune', \IPS\Settings::i()->stats_online_users_prune, FALSE, array( 'valueAs' => \IPS\Helpers\Form\Interval::DAYS, 'unlimited' => 0, 'unlimitedLang' => 'never' ), NULL, \IPS\Member::loggedIn()->language()->addToStack('after'), NULL, 'prune_log_moderator' ) );
+		$form = new Form;
+		$form->add( new Interval( 'stats_online_users_prune', Settings::i()->stats_online_users_prune, FALSE, array( 'valueAs' => Interval::DAYS, 'unlimited' => 0, 'unlimitedLang' => 'never' ), NULL, Member::loggedIn()->language()->addToStack('after'), NULL, 'prune_log_moderator' ) );
 	
 		if ( $values = $form->values() )
 		{
 			$form->saveAsSettings();
-			\IPS\Session::i()->log( 'acplog__statsonlineusers_settings' );
-			\IPS\Output::i()->redirect( \IPS\Http\Url::internal( 'app=core&module=stats&controller=onlineusers' ), 'saved' );
+			Session::i()->log( 'acplog__statsonlineusers_settings' );
+			Output::i()->redirect( Url::internal( 'app=core&module=stats&controller=onlineusers' ), 'saved' );
 		}
 	
-		\IPS\Output::i()->title		= \IPS\Member::loggedIn()->language()->addToStack('prunesettings');
-		\IPS\Output::i()->output 	= \IPS\Theme::i()->getTemplate('global')->block( 'prunesettings', $form, FALSE );
+		Output::i()->title		= Member::loggedIn()->language()->addToStack('prunesettings');
+		Output::i()->output 	= Theme::i()->getTemplate('global')->block( 'prunesettings', $form, FALSE );
 	}
 }

applications/core/modules/admin/stats/overview.php

@@ -11,50 +11,67 @@
 namespace IPS\core\modules\admin\stats;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+
+use DateTimeZone;
+use Exception;
+use IPS\Application;
+use IPS\DateTime;
+use IPS\Dispatcher;
+use IPS\Dispatcher\Controller;
+use IPS\Helpers\Form;
+use IPS\Helpers\Form\Date;
+use IPS\Helpers\Form\DateRange;
+use IPS\Helpers\Form\Select;
+use IPS\Member;
+use IPS\Output;
+use IPS\Request;
+use IPS\Theme;
+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;
 }
 
 /**
  * User activity statistics overview
  */
-class _overview extends \IPS\Dispatcher\Controller
+class overview extends Controller
 {
 	/**
 	 * @brief	Has been CSRF-protected
 	 */
-	public static $csrfProtected = TRUE;
+	public static bool $csrfProtected = TRUE;
 
 	/**
 	 * @brief	Allow MySQL RW separation for efficiency
 	 */
-	public static $allowRWSeparation = TRUE;
+	public static bool $allowRWSeparation = TRUE;
 
 	/**
 	 * @brief Date range to restrict to, or NULL for no restriction
 	 */
-	protected $dateRange = '7';
+	protected string $dateRange = '7';
 
 	/**
 	 * @brief Form object
 	 */
-	protected $form = NULL;
+	protected ?Form $form = NULL;
 
 	/**
 	 * @brief Template group to use to output
 	 */
-	protected $templateGroup = 'stats';
+	protected string $templateGroup = 'stats';
 
 	/**
 	 * Execute
 	 *
 	 * @return	void
 	 */
-	public function execute()
+	public function execute() : void
 	{
-		\IPS\Dispatcher::i()->checkAcpPermission( 'overview_manage' );
+		Dispatcher::i()->checkAcpPermission( 'overview_manage' );
 
 		$options = array(
 			'7'		=> 'last_week',
@@ -66,9 +83,9 @@ class _overview extends \IPS\Dispatcher\Controller
 			'-1'	=> 'custom'
 		);
 
-		$this->form = new \IPS\Helpers\Form( 'posts', 'update' );
-		$this->form->add( new \IPS\Helpers\Form\Select( 'predate', '7', FALSE, array( 'options' => $options, 'toggles' => array( '-1' => array( 'dateFilterInputs' ) ) ) ) );
-		$this->form->add( new \IPS\Helpers\Form\DateRange( 'date', NULL, FALSE, array(), NULL, NULL, NULL, 'dateFilterInputs' ) );
+		$this->form = new Form( 'posts', 'update' );
+		$this->form->add( new Select( 'predate', '7', FALSE, array( 'options' => $options, 'toggles' => array( '-1' => array( 'dateFilterInputs' ) ) ) ) );
+		$this->form->add( new DateRange( 'date', NULL, FALSE, array(), NULL, NULL, NULL, 'dateFilterInputs' ) );
 
 		parent::execute();
 	}
@@ -78,15 +95,15 @@ class _overview extends \IPS\Dispatcher\Controller
 	 *
 	 * @return	void
 	 */
-	protected function manage()
+	protected function manage() : void
 	{
-		$formHtml = $this->form->customTemplate( array( \IPS\Theme::i()->getTemplate( 'stats' ), 'filtersOverviewForm' ) );
-		$blocks = \IPS\Application::allExtensions( 'core', 'OverviewStatistics', TRUE, 'core', 'Registrations' );
+		$formHtml = $this->form->customTemplate( array( Theme::i()->getTemplate( 'stats' ), 'filtersOverviewForm' ) );
+		$blocks = Application::allExtensions( 'core', 'OverviewStatistics', TRUE, 'core', 'Registrations' );
 
-		\IPS\Output::i()->jsFiles  = array_merge( \IPS\Output::i()->jsFiles, \IPS\Output::i()->js( 'admin_stats.js', 'core' ) );
-		\IPS\Output::i()->cssFiles = array_merge( \IPS\Output::i()->cssFiles, \IPS\Theme::i()->css( 'system/statistics.css', 'core', 'admin' ) );
-		\IPS\Output::i()->title = \IPS\Member::loggedIn()->language()->addToStack('menu__core_stats_overview');
-		\IPS\Output::i()->output = \IPS\Theme::i()->getTemplate( $this->templateGroup )->overview( $formHtml, $blocks );
+		Output::i()->jsFiles  = array_merge( Output::i()->jsFiles, Output::i()->js( 'admin_stats.js', 'core' ) );
+		Output::i()->cssFiles = array_merge( Output::i()->cssFiles, Theme::i()->css( 'system/statistics.css', 'core', 'admin' ) );
+		Output::i()->title = Member::loggedIn()->language()->addToStack('menu__core_stats_overview');
+		Output::i()->output = Theme::i()->getTemplate( $this->templateGroup )->overview( $formHtml, $blocks );
 	}
 
 	/**
@@ -94,38 +111,38 @@ class _overview extends \IPS\Dispatcher\Controller
 	 *
 	 * @return	void
 	 */
-	protected function loadBlock()
+	protected function loadBlock() : void
 	{
-		$blocks = \IPS\Application::allExtensions( 'core', 'OverviewStatistics', TRUE, 'core', 'Registrations' );
+		$blocks = Application::allExtensions( 'core', 'OverviewStatistics', TRUE, 'core', 'Registrations' );
 
-		if( !isset( $blocks[ \IPS\Request::i()->blockKey ] ) )
+		if( !isset( $blocks[ Request::i()->blockKey ] ) )
 		{
-			\IPS\Output::i()->error( 'stats_overview_block_not_found', '2C412/1', 404, '' );
+			Output::i()->error( 'stats_overview_block_not_found', '2C412/1', 404, '' );
 		}
 
 		$dateFilters = NULL;
 
-		if( \IPS\Request::i()->range )
+		if( Request::i()->range )
 		{
-			$dateFilters = \IPS\Request::i()->range;
+			$dateFilters = Request::i()->range;
 		}
-		elseif( \IPS\Request::i()->start )
+		elseif( Request::i()->start )
 		{
 			try
 			{
-				$timezone = \IPS\Member::loggedIn()->timezone ? new \DateTimeZone( \IPS\Member::loggedIn()->timezone ) : NULL;
+				$timezone = Member::loggedIn()->timezone ? new DateTimeZone( Member::loggedIn()->timezone ) : NULL;
 			}
-			catch ( \Exception $e )
+			catch ( Exception $e )
 			{
 				$timezone = NULL;
 			}
 
 			$dateFilters = array(
-				'start'	=> new \IPS\DateTime( \IPS\Helpers\Form\Date::_convertDateFormat( \IPS\Request::i()->start ), $timezone ),
-				'end'	=> ( new \IPS\DateTime( \IPS\Helpers\Form\Date::_convertDateFormat( \IPS\Request::i()->end ), $timezone ) )->setTime( 23, 59, 59 )
+				'start'	=> new DateTime( Date::_convertDateFormat( Request::i()->start ), $timezone ),
+				'end'	=> ( new DateTime( Date::_convertDateFormat( Request::i()->end ), $timezone ) )->setTime( 23, 59, 59 )
 			);
 		}
 
-		\IPS\Output::i()->sendOutput( $blocks[ \IPS\Request::i()->blockKey ]->getBlock( $dateFilters, \IPS\Request::i()->subblock ) );
+		Output::i()->sendOutput( $blocks[ Request::i()->blockKey ]->getBlock( $dateFilters, Request::i()->subblock ) );
 	}
 }

applications/core/modules/admin/stats/points.php

@@ -12,30 +12,39 @@
 namespace IPS\core\modules\admin\stats;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+
+use IPS\core\Statistics\Chart;
+use IPS\Dispatcher;
+use IPS\Dispatcher\Controller;
+use IPS\Http\Url;
+use IPS\Member;
+use IPS\Output;
+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;
 }
 
 /**
  * points
  */
-class _points extends \IPS\Dispatcher\Controller
+class points extends Controller
 {
 	/**
 	 * @brief	Allow MySQL RW separation for efficiency
 	 */
-	public static $allowRWSeparation = TRUE;
+	public static bool $allowRWSeparation = TRUE;
 
 	/**
 	 * Execute
 	 *
 	 * @return	void
 	 */
-	public function execute()
+	public function execute() : void
 	{
-		\IPS\Dispatcher::i()->checkAcpPermission( 'overview_manage' );
+		Dispatcher::i()->checkAcpPermission( 'overview_manage' );
 		parent::execute();
 	}
 
@@ -44,10 +53,10 @@ class _points extends \IPS\Dispatcher\Controller
 	 *
 	 * @return	void
 	 */
-	protected function manage()
+	protected function manage() : void
 	{
-		$chart = \IPS\core\Statistics\Chart::loadFromExtension( 'core', 'Points' )->getChart( \IPS\Http\Url::internal( "app=core&module=stats&controller=points" ) );
-		\IPS\Output::i()->title = \IPS\Member::loggedIn()->language()->addToStack('menu__core_stats_points');
-		\IPS\Output::i()->output	= (string) $chart;
+		$chart = Chart::loadFromExtension( 'core', 'Points' )->getChart( Url::internal( "app=core&module=stats&controller=points" ) );
+		Output::i()->title = Member::loggedIn()->language()->addToStack('menu__core_stats_points');
+		Output::i()->output	= (string) $chart;
 	}
 }

applications/core/modules/admin/stats/preferences.php

@@ -12,25 +12,36 @@
 namespace IPS\core\modules\admin\stats;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+
+use IPS\core\Statistics\Chart;
+use IPS\Dispatcher;
+use IPS\Dispatcher\Controller;
+use IPS\Http\Url;
+use IPS\Member;
+use IPS\Output;
+use IPS\Request;
+use IPS\Theme;
+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;
 }
 
 /**
  * preferences
  */
-class _preferences extends \IPS\Dispatcher\Controller
+class preferences extends Controller
 {
 	/**
 	 * Execute
 	 *
 	 * @return	void
 	 */
-	public function execute()
+	public function execute() : void
 	{
-		\IPS\Dispatcher::i()->checkAcpPermission( 'preferences_manage' );
+		Dispatcher::i()->checkAcpPermission( 'preferences_manage' );
 		parent::execute();
 	}
 
@@ -39,43 +50,36 @@ class _preferences extends \IPS\Dispatcher\Controller
 	 *
 	 * @return	void
 	 */
-	protected function manage()
+	protected function manage() : void
 	{
 		$tabs		= array(
 			'theme'		=> 'stats_member_pref_theme',
 			'lang'		=> 'stats_member_pref_lang',
 		);
-		\IPS\Request::i()->tab ??= 'lang';
-		$activeTab	= ( isset( \IPS\Request::i()->tab ) and array_key_exists( \IPS\Request::i()->tab, $tabs ) ) ? \IPS\Request::i()->tab : 'lang';
+		Request::i()->tab ??= 'lang';
+		$activeTab	= ( isset( Request::i()->tab ) and array_key_exists( Request::i()->tab, $tabs ) ) ? Request::i()->tab : 'lang';
 
 		switch( $activeTab )
 		{
 			case 'theme':
-				$chart = \IPS\core\Statistics\Chart::loadFromExtension( 'core', 'Theme' )->getChart( \IPS\Http\Url::internal( "app=core&module=stats&controller=preferences&tab=theme" ) );
+
+				$chart = Chart::loadFromExtension( 'core', 'Theme' )->getChart( Url::internal( "app=core&module=stats&controller=preferences&tab=theme" ) );
 				break;
 				
 			case 'lang':
-				$chart = \IPS\core\Statistics\Chart::loadFromExtension( 'core', 'Language' )->getChart( \IPS\Http\Url::internal( "app=core&module=stats&controller=preferences&tab=lang" ) );
+
+				$chart = Chart::loadFromExtension( 'core', 'Language' )->getChart( Url::internal( "app=core&module=stats&controller=preferences&tab=lang" ) );
 				break;
 		}
 		
-		$chart = $chart->render('PieChart', array( 
-				'backgroundColor' 	=> '#ffffff',
-				'pieHole' => 0.4,
-				'chartArea' => array( 
-					'width' =>"90%", 
-					'height' => "90%" 
-				) 
-			) );
-		
-		if ( \IPS\Request::i()->isAjax() )
+		if ( Request::i()->isAjax() )
 		{
-			\IPS\Output::i()->output = \IPS\Theme::i()->getTemplate( 'global' )->paddedBlock( (string) $chart, NULL, "ipsPad" );
+			Output::i()->output = Theme::i()->getTemplate( 'global' )->paddedBlock( (string) $chart, NULL, "i-padding_3" );
 		}
 		else
 		{
-			\IPS\Output::i()->title = \IPS\Member::loggedIn()->language()->addToStack('menu__core_stats_preferences');
-			\IPS\Output::i()->output = \IPS\Theme::i()->getTemplate( 'global', 'core' )->tabs( $tabs, $activeTab, (string) $chart, \IPS\Http\Url::internal( "app=core&module=stats&controller=preferences" ), 'tab', '', 'ipsPad' );
+			Output::i()->title = Member::loggedIn()->language()->addToStack('menu__core_stats_preferences');
+			Output::i()->output = Theme::i()->getTemplate( 'global', 'core' )->tabs( $tabs, $activeTab, (string) $chart, Url::internal( "app=core&module=stats&controller=preferences" ), 'tab', '', 'i-padding_3' );
 		}
 			
 	}

applications/core/modules/admin/stats/rankprogression.php

@@ -12,30 +12,40 @@
 namespace IPS\core\modules\admin\stats;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+
+use IPS\core\Statistics\Chart;
+use IPS\Dispatcher;
+use IPS\Dispatcher\Controller;
+use IPS\Member;
+use IPS\Output;
+use IPS\Theme;
+use IPS\Http\Url;
+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;
 }
 
 /**
  * rankprogression
  */
-class _rankprogression extends \IPS\Dispatcher\Controller
+class rankprogression extends Controller
 {
 	/**
 	 * @brief	Allow MySQL RW separation for efficiency
 	 */
-	public static $allowRWSeparation = TRUE;
+	public static bool $allowRWSeparation = TRUE;
 
 	/**
 	 * Execute
 	 *
 	 * @return	void
 	 */
-	public function execute()
+	public function execute() : void
 	{
-		\IPS\Dispatcher::i()->checkAcpPermission( 'overview_manage' );
+		Dispatcher::i()->checkAcpPermission( 'overview_manage' );
 		parent::execute();
 	}
 
@@ -44,14 +54,14 @@ class _rankprogression extends \IPS\Dispatcher\Controller
 	 *
 	 * @return	void
 	 */
-	protected function manage()
+	protected function manage() : void
 	{
-		$chart = \IPS\core\Statistics\Chart::loadFromExtension( 'core', 'RankProgression' )->getChart( \IPS\Http\Url::internal( "app=core&module=stats&controller=rankprogression" ) );
-		\IPS\Output::i()->title = \IPS\Member::loggedIn()->language()->addToStack('menu__core_stats_rankprogression');
-		\IPS\Output::i()->output = \IPS\Theme::i()->getTemplate( 'stats' )->rankprogressionmessage();
-		\IPS\Output::i()->output .= $chart->render( 'ScatterChart', array(
+		$chart = Chart::loadFromExtension( 'core', 'RankProgression' )->getChart( Url::internal( "app=core&module=stats&controller=rankprogression" ) );
+		Output::i()->title = Member::loggedIn()->language()->addToStack('menu__core_stats_rankprogression');
+		Output::i()->output = Theme::i()->getTemplate( 'stats' )->rankprogressionmessage();
+		Output::i()->output .= $chart->render( 'ScatterChart', array(
 			'is3D'	=> TRUE,
-			'vAxis'	=> array( 'title' => \IPS\Member::loggedIn()->language()->addToStack("core_stats_rank_progression_v") ),
+			'vAxis'	=> array( 'title' => Member::loggedIn()->language()->addToStack("core_stats_rank_progression_v") ),
 			'legend' => 'none'
 		) );
 	}

applications/core/modules/admin/stats/referrals.php

@@ -12,22 +12,39 @@
 namespace IPS\core\modules\admin\stats;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+
+use IPS\DateTime;
+use IPS\Db;
+use IPS\Dispatcher;
+use IPS\Dispatcher\Controller;
+use IPS\Helpers\Form;
+use IPS\Helpers\Form\DateRange;
+use IPS\Http\Url;
+use IPS\Member;
+use IPS\Output;
+use IPS\Request;
+use IPS\Theme;
+use UnderflowException;
+use function count;
+use function defined;
+use function intval;
+
+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;
 }
 
 /**
  * referrals
  */
-class _referrals extends \IPS\Dispatcher\Controller
+class referrals extends Controller
 {
 	
 	/**
 	 * @brief	Has been CSRF-protected
 	 */
-	public static $csrfProtected = TRUE;
+	public static bool $csrfProtected = TRUE;
 	
 	/**
 	 * @brief	Number of results per page
@@ -39,9 +56,9 @@ class _referrals extends \IPS\Dispatcher\Controller
 	 *
 	 * @return	void
 	 */
-	public function execute()
+	public function execute() : void
 	{
-		\IPS\Dispatcher::i()->checkAcpPermission( 'referrals_manage' );
+		Dispatcher::i()->checkAcpPermission( 'referrals_manage' );
 		parent::execute();
 	}
 
@@ -50,44 +67,44 @@ class _referrals extends \IPS\Dispatcher\Controller
 	 *
 	 * @return	void
 	 */
-	protected function manage()
+	protected function manage() : void
 	{
 		$where = array();
-		if ( isset( \IPS\Request::i()->form ) )
+		if ( isset( Request::i()->form ) )
 		{
-			$form = new \IPS\Helpers\Form( 'form', 'go' );
+			$form = new Form( 'form', 'go' );
 
 			$default = array(
-				'start' => \IPS\Request::i()->start ? \IPS\DateTime::ts( \IPS\Request::i()->start ) : NULL,
-				'end' => \IPS\Request::i()->end ? \IPS\DateTime::ts( \IPS\Request::i()->end ) : NULL
+				'start' => Request::i()->start ? DateTime::ts( Request::i()->start ) : NULL,
+				'end' => Request::i()->end ? DateTime::ts( Request::i()->end ) : NULL
 			);
 
-			$form->add( new \IPS\Helpers\Form\DateRange( 'stats_date_range', $default, FALSE, array( 'start' => array( 'max' => \IPS\DateTime::ts( time() )->setTime( 0, 0, 0 ), 'time' => FALSE ), 'end' => array( 'max' => \IPS\DateTime::ts( time() )->setTime( 23, 59, 59 ), 'time' => FALSE ) ) ) );
+			$form->add( new DateRange( 'stats_date_range', $default, FALSE, array( 'start' => array( 'max' => DateTime::ts( time() )->setTime( 0, 0, 0 ), 'time' => FALSE ), 'end' => array( 'max' => DateTime::ts( time() )->setTime( 23, 59, 59 ), 'time' => FALSE ) ) ) );
 
 			if ( !$values = $form->values() )
 			{
-				\IPS\Output::i()->output = $form;
+				Output::i()->output = $form;
 				return;
 			}
 		}
 
 		/* Figure out start and end parameters for links */
 		$params = array(
-			'start' => !empty( $values['stats_date_range']['start'] ) ? $values['stats_date_range']['start']->getTimestamp() : \IPS\Request::i()->start,
-			'end' => !empty( $values['stats_date_range']['end'] ) ? $values['stats_date_range']['end']->getTimestamp() : \IPS\Request::i()->end
+			'start' => !empty( $values['stats_date_range']['start'] ) ? $values['stats_date_range']['start']->getTimestamp() : Request::i()->start,
+			'end' => !empty( $values['stats_date_range']['end'] ) ? $values['stats_date_range']['end']->getTimestamp() : Request::i()->end
 		);
 
 		if( $params['start'] )
 		{
-			$where[] = array( 'core_members.joined>?', $params['start'] );
+			$where[] = array( 'joined>?', $params['start'] );
 		}
 
 		if( $params['end'] )
 		{
-			$where[] = array( 'core_members.joined<?', $params['end'] );
+			$where[] = array( 'joined<?', $params['end'] );
 		}
 		
-		$page = isset( \IPS\Request::i()->page ) ? \intval( \IPS\Request::i()->page ) : 1;
+		$page = isset( Request::i()->page ) ? intval( Request::i()->page ) : 1;
 
 		if( $page < 1 )
 		{
@@ -96,18 +113,16 @@ class _referrals extends \IPS\Dispatcher\Controller
 
 		try
 		{
-			$total = \IPS\Db::i()->select( 'COUNT(DISTINCT(core_referrals.referred_by))', 'core_referrals', $where )
-								 ->join( 'core_members', 'core_members.member_id = core_referrals.member_id')->first();
+			$total = Db::i()->select( 'COUNT(DISTINCT(core_referrals.referred_by))', 'core_referrals', $where )->join( 'core_members', 'core_members.member_id = core_referrals.referred_by')->first();
 		}
-		catch ( \UnderflowException $e )
+		catch ( UnderflowException $e )
 		{
 			$total = 0;
 		}
 
 		if( $total )
 		{
-			$select	= \IPS\Db::i()->select( 'core_referrals.referred_by as member_id, count(*) as count', 'core_referrals', $where, 'count DESC', array( ( $page - 1 ) * static::PER_PAGE, static::PER_PAGE ), 'member_id' )
-									 ->join( 'core_members', 'core_members.member_id = core_referrals.member_id');
+			$select	= Db::i()->select( 'core_referrals.referred_by as member_id, count(*) as count', 'core_referrals', $where, 'count DESC', array( ( $page - 1 ) * static::PER_PAGE, static::PER_PAGE ), 'member_id' )->join( 'core_members', 'core_members.member_id = core_referrals.referred_by');
 			$mids = array();
 
 			foreach( $select as $row )
@@ -117,35 +132,35 @@ class _referrals extends \IPS\Dispatcher\Controller
 
 			$members = array();
 
-			if ( \count( $mids ) )
+			if ( count( $mids ) )
 			{
-				$members = iterator_to_array( \IPS\Db::i()->select( '*', 'core_members', array( \IPS\Db::i()->in( 'member_id', $mids ) ) )->setKeyField('member_id') );
+				$members = iterator_to_array( Db::i()->select( '*', 'core_members', array( Db::i()->in( 'member_id', $mids ) ) )->setKeyField('member_id') );
 			}
 
-			$pagination = \IPS\Theme::i()->getTemplate( 'global', 'core', 'global' )->pagination(
-				\IPS\Http\Url::internal( 'app=core&module=stats&controller=referrals' )->setQueryString( $params ),
+			$pagination = Theme::i()->getTemplate( 'global', 'core', 'global' )->pagination(
+				Url::internal( 'app=core&module=stats&controller=referrals' )->setQueryString( $params ),
 				ceil( $total / static::PER_PAGE ),
 				$page,
 				static::PER_PAGE,
 				FALSE
 			);
 
-			\IPS\Output::i()->sidebar['actions'] = array(
+			Output::i()->sidebar['actions'] = array(
 				'settings'	=> array(
 					'title'		=> 'stats_date_range',
 					'icon'		=> 'calendar',
-					'link'		=> \IPS\Http\Url::internal( 'app=core&module=stats&controller=referrals&form=1' )->setQueryString( $params ),
-					'data'		=> array( 'ipsDialog' => '', 'ipsDialog-title' => \IPS\Member::loggedIn()->language()->addToStack('stats_date_range') )
+					'link'		=> Url::internal( 'app=core&module=stats&controller=referrals&form=1' )->setQueryString( $params ),
+					'data'		=> array( 'ipsDialog' => '', 'ipsDialog-title' => Member::loggedIn()->language()->addToStack('stats_date_range') )
 				)
 			);
 
-			\IPS\Output::i()->output = \IPS\Theme::i()->getTemplate('stats' )->topMembers( $select, $pagination, $members, $total );
-			\IPS\Output::i()->title = \IPS\Member::loggedIn()->language()->addToStack('menu__core_stats_referrals');
+			Output::i()->output = Theme::i()->getTemplate('stats' )->topMembers( $select, $pagination, $members, $total );
+			Output::i()->title = Member::loggedIn()->language()->addToStack('menu__core_stats_referrals');
 		}
 		else
 		{
 			/* Return the no results message */
-			\IPS\Output::i()->output .= \IPS\Theme::i()->getTemplate( 'global', 'core' )->block( \IPS\Member::loggedIn()->language()->addToStack('menu__core_stats_referrals'), \IPS\Member::loggedIn()->language()->addToStack('no_results'), FALSE , 'ipsPad', NULL, TRUE );
+			Output::i()->output .= Theme::i()->getTemplate( 'global', 'core' )->block( Member::loggedIn()->language()->addToStack('menu__core_stats_referrals'), Member::loggedIn()->language()->addToStack('no_results'), FALSE , 'i-padding_3', NULL, TRUE );
 		}
 	}
 	

applications/core/modules/admin/stats/registrationstats.php

@@ -11,38 +11,47 @@
 namespace IPS\core\modules\admin\stats;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+
+use IPS\core\Statistics\Chart;
+use IPS\Dispatcher;
+use IPS\Dispatcher\Controller;
+use IPS\Http\Url;
+use IPS\Member;
+use IPS\Output;
+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;
 }
 
 /**
  * Registration Stats
  */
-class _registrationstats extends \IPS\Dispatcher\Controller
+class registrationstats extends Controller
 {
 	/**
 	 * @brief	Has been CSRF-protected
 	 */
-	public static $csrfProtected = TRUE;
+	public static bool $csrfProtected = TRUE;
 
 	/**
 	 * @brief	Allow MySQL RW separation for efficiency
 	 */
-	public static $allowRWSeparation = TRUE;
+	public static bool $allowRWSeparation = TRUE;
 	
 	/**
 	 * Manage Members
 	 *
 	 * @return	void
 	 */
-	protected function manage()
+	protected function manage() : void
 	{
 		/* Check permission */
-		\IPS\Dispatcher::i()->checkAcpPermission( 'registrations_manage', 'core', 'stats' );
+		Dispatcher::i()->checkAcpPermission( 'registrations_manage', 'core', 'stats' );
 
-		\IPS\Output::i()->title = \IPS\Member::loggedIn()->language()->addToStack('menu__core_stats_registrationstats');
-		\IPS\Output::i()->output = (string) \IPS\core\Statistics\Chart::loadFromExtension( 'core', 'Registrations' )->getChart( \IPS\Http\Url::internal( 'app=core&module=stats&controller=registrationstats' ) );
+		Output::i()->title = Member::loggedIn()->language()->addToStack('menu__core_stats_registrationstats');
+		Output::i()->output = Chart::loadFromExtension( 'core', 'Registrations' )->getChart( Url::internal( 'app=core&module=stats&controller=registrationstats' ) );
 	}
 }

applications/core/modules/admin/stats/spam.php

@@ -12,31 +12,40 @@
 namespace IPS\core\modules\admin\stats;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+
+use IPS\core\Statistics\Chart;
+use IPS\Dispatcher;
+use IPS\Dispatcher\Controller;
+use IPS\Http\Url;
+use IPS\Member;
+use IPS\Output;
+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;
 }
 
 /**
  * spam
  */
-class _spam extends \IPS\Dispatcher\Controller
+class spam extends Controller
 {
 	
 	/**
 	 * @brief	Has been CSRF-protected
 	 */
-	public static $csrfProtected = TRUE;
+	public static bool $csrfProtected = TRUE;
 	
 	/**
 	 * Execute
 	 *
 	 * @return	void
 	 */
-	public function execute()
+	public function execute() : void
 	{
-		\IPS\Dispatcher::i()->checkAcpPermission( 'spam_manage' );
+		Dispatcher::i()->checkAcpPermission( 'spam_manage' );
 		parent::execute();
 	}
 
@@ -45,13 +54,9 @@ class _spam extends \IPS\Dispatcher\Controller
 	 *
 	 * @return	void
 	 */
-	protected function manage()
-	{	
-		$chart = \IPS\core\Statistics\Chart::loadFromExtension( 'core', 'Spam' )->getChart( \IPS\Http\Url::internal( "app=core&module=stats&controller=spam" ) );
-		\IPS\Output::i()->title = \IPS\Member::loggedIn()->language()->addToStack('menu__core_stats_spam');
-		\IPS\Output::i()->output = (string) $chart;
-
-	} 
-	
-	// Create new methods with the same name as the 'do' parameter which should execute it
+	protected function manage() : void
+	{
+		Output::i()->title = Member::loggedIn()->language()->addToStack('menu__core_stats_spam');
+		Output::i()->output = (string) $chart = Chart::loadFromExtension( 'core', 'Spam' )->getChart( Url::internal( "app=core&module=stats&controller=spam" ) );
+	}
 }

applications/core/modules/admin/stats/warnings.php

@@ -12,31 +12,42 @@
 namespace IPS\core\modules\admin\stats;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+
+use IPS\core\Statistics\Chart;
+use IPS\Dispatcher;
+use IPS\Dispatcher\Controller;
+use IPS\Http\Url;
+use IPS\Member;
+use IPS\Output;
+use IPS\Request;
+use IPS\Theme;
+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;
 }
 
 /**
  * warnings
  */
-class _warnings extends \IPS\Dispatcher\Controller
+class warnings extends Controller
 {
 	
 	/**
 	 * @brief	Has been CSRF-protected
 	 */
-	public static $csrfProtected = TRUE;
+	public static bool $csrfProtected = TRUE;
 	
 	/**
 	 * Execute
 	 *
 	 * @return	void
 	 */
-	public function execute()
+	public function execute() : void
 	{
-		\IPS\Dispatcher::i()->checkAcpPermission( 'warnings_manage' );
+		Dispatcher::i()->checkAcpPermission( 'warnings_manage' );
 		parent::execute();
 	}
 
@@ -45,34 +56,34 @@ class _warnings extends \IPS\Dispatcher\Controller
 	 *
 	 * @return	void
 	 */
-	protected function manage()
+	protected function manage() : void
 	{
-		$tabs		= array(
+		$tabs = array(
 			'reason'			=> 'stats_warnings_reason',
 			'suspended'		=> 'stats_warnings_suspended',
 		);
-		
+
 		/* Make sure tab is set, otherwise saved charts may not show up when loading the page. */
-		\IPS\Request::i()->tab ??= 'reason';
-		$activeTab	= ( array_key_exists( \IPS\Request::i()->tab, $tabs ) ) ? \IPS\Request::i()->tab : 'reason';
+		Request::i()->tab ??= 'reason';
+		$activeTab	= ( array_key_exists( Request::i()->tab, $tabs ) ) ? Request::i()->tab : 'reason';
 
 		if ( $activeTab === 'reason' )
 		{
-			$chart = \IPS\core\Statistics\Chart::loadFromExtension( 'core', 'WarningReasons' )->getChart( \IPS\Http\Url::internal( 'app=core&module=stats&controller=warnings&tab=reason' ) );
+			$chart = Chart::loadFromExtension( 'core', 'WarningReasons' )->getChart( Url::internal( 'app=core&module=stats&controller=warnings&tab=reason' ) );
 		}
 		else if ( $activeTab === 'suspended' )
 		{
-			$chart = \IPS\core\Statistics\Chart::loadFromExtension( 'core', 'WarningSuspended' )->getChart( \IPS\Http\Url::internal( 'app=core&module=stats&controller=warnings&tab=suspended' ) );
+			$chart = Chart::loadFromExtension( 'core', 'WarningSuspended' )->getChart( Url::internal( 'app=core&module=stats&controller=warnings&tab=suspended' ) );
 		}
 		
-		if ( \IPS\Request::i()->isAjax() )
+		if ( Request::i()->isAjax() )
 		{
-			\IPS\Output::i()->output = (string) $chart;
+			Output::i()->output = (string) $chart;
 		}
 		else
 		{
-			\IPS\Output::i()->title = \IPS\Member::loggedIn()->language()->addToStack('menu__core_stats_warnings');
-			\IPS\Output::i()->output = \IPS\Theme::i()->getTemplate( 'global', 'core' )->tabs( $tabs, $activeTab, (string) $chart, \IPS\Http\Url::internal( "app=core&module=stats&controller=warnings" ), 'tab', '', 'ipsPad' );
+			Output::i()->title = Member::loggedIn()->language()->addToStack('menu__core_stats_warnings');
+			Output::i()->output = Theme::i()->getTemplate( 'global', 'core' )->tabs( $tabs, $activeTab, (string) $chart, Url::internal( "app=core&module=stats&controller=warnings" ), 'tab', '', 'i-padding_3' );
 		}
 	}