Version 5.0.0 beta 1

applications/forums/modules/admin/stats/solvers.php

@@ -11,13 +11,14 @@
 
 namespace IPS\forums\modules\admin\stats;
 
+use IPS\DateTime;
 use IPS\Dispatcher;
 use IPS\Dispatcher\Controller;
-use IPS\Db;
 use IPS\Helpers\Table\Db as TableDb;
 use IPS\Http\Url;
 use IPS\Http\Url\Friendly;
 use IPS\Member;
+use IPS\Member\Group;
 use IPS\Theme;
 use IPS\Output;
 
@@ -30,33 +31,33 @@ use const IPS\Helpers\Table\SEARCH_SELECT;
 /* 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;
 }
 
 /**
  * solvers
  */
-class _solvers extends Controller
+class solvers 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( 'solvers_manage' );
+		Dispatcher::i()->checkAcpPermission( 'topics_manage' );
 		parent::execute();
 	}
 
@@ -65,17 +66,17 @@ class _solvers extends Controller
 	 *
 	 * @return	void
 	 */
-	protected function manage()
+	protected function manage() : void
 	{
 		$table = new TableDb( 'core_solved_index', Url::internal( "app=forums&module=stats&controller=solvers" ) );
 		$table->langPrefix = 'top_solvers_';
-		$table->groupBy = array( 'core_members.member_id', 'core_members.name', 'core_members.member_group_id' );
-		$table->selects = array( 'COUNT(core_members.member_id) AS count', 'core_members.member_id', 'core_members.name', 'MAX(core_solved_index.solved_date) AS date', 'core_members.member_group_id' );
-		$table->joins	= array( array( 'from' => 'core_members', 'where' => 'core_solved_index.member_id=core_members.member_id', 'type' => 'RIGHT' ) );
+		$table->groupBy = array( 'core_solved_index.member_id', /*'core_members.name', 'core_members.member_group_id'*/ );
+		$table->selects = array( 'COUNT(core_solved_index.member_id) AS count', 'core_solved_index.member_id', 'core_members.name', 'MAX(core_solved_index.solved_date) AS date', 'core_members.member_group_id' );
+		$table->joins	= array( array( 'from' => 'core_members', 'where' => 'core_solved_index.member_id=core_members.member_id', 'type' => 'LEFT' ) );
 		$table->include	= array( 'name', 'count', 'date', 'member_group_id' );
 		$table->parsers = array(
 			'name'			=> function( $val, $row ) {
-				return Theme::i()->getTemplate( 'global', 'core' )->userLinkWithPhoto( \IPS\Member::load( $row['member_id'] ) );
+				return Theme::i()->getTemplate( 'global', 'core' )->userLinkWithPhoto( Member::load( $row['member_id'] ) );
 			},
 			'count'			=> function( $val, $row ) {
 				$url	= Url::internal( "app=core&module=members&controller=profile&id={$row['member_id']}&do=solutions", 'front', 'profile_solutions', array( Friendly::seoTitle( $row['name'] ) ) );
@@ -83,15 +84,18 @@ class _solvers extends Controller
 				return Theme::i()->getTemplate( 'global', 'core', 'global' )->basicUrl( $url, TRUE, $count );
 			},
 			'date'	=> function( $val ) {
-				return (string) \IPS\DateTime::ts( $val );
+				if( $val )
+				{
+					return (string) DateTime::ts( $val );
+				}
 			},
 			'member_group_id' => function( $val ) {
-				return \IPS\Member\Group::load( $val )->name;
+				return Group::load( $val )->name;
 			}
 		);
 		
 		$groups = array();
-		foreach( \IPS\Member\Group::groups( showGuestGroups: FALSE ) AS $group )
+		foreach( Group::groups( showGuestGroups: FALSE ) AS $group )
 		{
 			$groups[ $group->g_id ] = $group->name;
 		}