Version 5.0.0 beta 1

applications/core/modules/admin/settings/securityquestions.php

@@ -11,41 +11,50 @@
 namespace IPS\core\modules\admin\settings;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+
+use IPS\Http\Url;
+use IPS\Member;
+use IPS\Node\Controller;
+use IPS\Node\Model;
+use IPS\Output;
+use IPS\Request;
+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;
 }
 
 /**
  * Security Questions
  */
-class _securityquestions extends \IPS\Node\Controller
+class securityquestions extends Controller
 {
 	/**
 	 * @brief	Has been CSRF-protected
 	 */
-	public static $csrfProtected = TRUE;
+	public static bool $csrfProtected = TRUE;
 	
 	/**
 	 * Node Class
 	 */
-	protected $nodeClass = '\IPS\MFA\SecurityQuestions\Question';
+	protected string $nodeClass = '\IPS\MFA\SecurityQuestions\Question';
 
 	/**
 	 * Show the "add" button in the page root rather than the table root
 	 */
-	protected $_addButtonInRoot = FALSE;
+	protected bool $_addButtonInRoot = FALSE;
 
 	/**
 	 * Form
 	 *
 	 * @return	void
 	 */
-	public function form()
+	public function form() : void
 	{
-		\IPS\Output::i()->breadcrumb[] = array( \IPS\Http\Url::internal('app=core&module=settings&controller=mfa&tab=handlers'), \IPS\Member::loggedIn()->language()->addToStack('menu__core_settings_mfa') );
-		\IPS\Output::i()->breadcrumb[] = array( \IPS\Http\Url::internal('app=core&module=settings&controller=mfa&tab=questions&do=settings&key=questions'), \IPS\Member::loggedIn()->language()->addToStack("mfa_questions_title") );
+		Output::i()->breadcrumb[] = array( Url::internal('app=core&module=settings&controller=mfa&tab=handlers'), Member::loggedIn()->language()->addToStack('menu__core_settings_mfa') );
+		Output::i()->breadcrumb[] = array( Url::internal('app=core&module=settings&controller=mfa&tab=questions&do=settings&key=questions'), Member::loggedIn()->language()->addToStack("mfa_questions_title") );
 		parent::form();
 	}
 		
@@ -54,28 +63,28 @@ class _securityquestions extends \IPS\Node\Controller
 	 *
 	 * @return	void
 	 */
-	protected function settings()
+	protected function settings() : void
 	{
-		return $this->manage();
+		$this->manage();
 	}
-	
+
 	/**
 	 * Redirect after save
 	 *
-	 * @param	\IPS\Node\Model	$old			A clone of the node as it was before or NULL if this is a creation
-	 * @param	\IPS\Node\Model	$new			The node now
-	 * @param	string			$lastUsedTab	The tab last used in the form
-	 * @return	void
+	 * @param Model|null $old A clone of the node as it was before or NULL if this is a creation
+	 * @param Model $new The node now
+	 * @param string $lastUsedTab The tab last used in the form
+	 * @return    void
 	 */
-	protected function _afterSave( ?\IPS\Node\Model $old, \IPS\Node\Model $new, $lastUsedTab = FALSE )
+	protected function _afterSave( ?Model $old, Model $new, mixed $lastUsedTab = FALSE ): void
 	{
-		if( \IPS\Request::i()->isAjax() )
+		if( Request::i()->isAjax() )
 		{
-			\IPS\Output::i()->json( array() );
+			Output::i()->json( array() );
 		}
 		else
 		{
-			\IPS\Output::i()->redirect( \IPS\Http\Url::internal('app=core&module=settings&controller=mfa&tab=handlers&do=settings&key=questions&tab=questions'), 'saved' );
+			Output::i()->redirect( Url::internal('app=core&module=settings&controller=mfa&tab=handlers&do=settings&key=questions&tab=questions'), 'saved' );
 		}
 	}
 }