Moves code for handling redirects and unexpected request URLs out of Theme and into more appropriate locations

Sources/Actions/Activate.php

@@ -96,6 +96,9 @@ public function isRestrictedGuestAccessAllowed(): bool
 	 */
 	public function execute(): void
 	{
+		Lang::load('Login');
+		Theme::loadTemplate('Login');
+
 		if (!isset($this->member)) {
 			if (empty($_REQUEST['u']) && empty($_POST['user'])) {
 				$this->showResendRequest();
@@ -239,9 +242,6 @@ protected function __construct()
 			Utils::redirectexit('action=profile');
 		}
 
-		Lang::load('Login');
-		Theme::loadTemplate('Login');
-
 		// We can't activate anyone without knowing whom to activate.
 		if (empty($_REQUEST['u']) && empty($_POST['user'])) {
 			return;

Sources/Actions/Admin/ACP.php

@@ -28,8 +28,6 @@
 use SMF\Lang;
 use SMF\Mail;
 use SMF\Menu;
-use SMF\OutputTypeInterface;
-use SMF\OutputTypes;
 use SMF\Parser;
 use SMF\Routable;
 use SMF\SecurityToken;
@@ -726,16 +724,6 @@ class ACP implements ActionInterface, Routable
 	 * Public methods
 	 ****************/
 
-	public function isSimpleAction(): bool
-	{
-		return isset($_REQUEST['preview']);
-	}
-
-	public function getOutputType(): OutputTypeInterface
-	{
-		return isset($_REQUEST['preview']) ? new OutputTypes\Xml() : new OutputTypes\Html();
-	}
-
 	/**
 	 * The main admin handling function.
 	 *
@@ -745,6 +733,8 @@ public function getOutputType(): OutputTypeInterface
 	 */
 	public function execute(): void
 	{
+		$this->init();
+
 		// Make sure the administrator has a valid session...
 		User::$me->validateSession();
 
@@ -1863,9 +1853,9 @@ public static function adminLogin(string $type = 'admin'): void
 	 ******************/
 
 	/**
-	 * Constructor. Protected to force instantiation via self::load().
+	 * Does some initial setup.
 	 */
-	protected function __construct()
+	protected function init()
 	{
 		// Load the language and templates....
 		Lang::load('Admin');

Sources/Actions/Admin/Attachments.php

@@ -91,6 +91,8 @@ class Attachments implements ActionInterface
 	 */
 	public function execute(): void
 	{
+		$this->init();
+
 		$call = method_exists($this, self::$subactions[$this->subaction]) ? [$this, self::$subactions[$this->subaction]] : Utils::getCallable(self::$subactions[$this->subaction]);
 
 		if (!empty($call)) {
@@ -2568,9 +2570,9 @@ public static function attachDirStatus(string $dir, int $expected_files): array
 	 ******************/
 
 	/**
-	 * Constructor. Protected to force instantiation via self::load().
+	 * Does some initial setup.
 	 */
-	protected function __construct()
+	protected function init()
 	{
 		// You have to be able to moderate the forum to do this.
 		User::$me->isAllowedTo('manage_attachments');

Sources/Actions/Admin/Bans.php

@@ -85,6 +85,8 @@ class Bans implements ActionInterface
 	 */
 	public function execute(): void
 	{
+		$this->init();
+
 		User::$me->isAllowedTo('manage_bans');
 
 		$call = method_exists($this, self::$subactions[$this->subaction]) ? [$this, self::$subactions[$this->subaction]] : Utils::getCallable(self::$subactions[$this->subaction]);
@@ -1468,9 +1470,9 @@ public static function list_getNumBanLogEntries(): int
 	 ******************/
 
 	/**
-	 * Constructor. Protected to force instantiation via self::load().
+	 * Does some initial setup.
 	 */
-	protected function __construct()
+	protected function init()
 	{
 		Theme::loadTemplate('ManageBans');
 

Sources/Actions/Admin/Boards.php

@@ -93,6 +93,30 @@ class Boards implements ActionInterface
 	 */
 	public function execute(): void
 	{
+		// Special handling for modifycat.
+		if (($_REQUEST['action'] ?? '') === 'modifycat') {
+			self::modifyCat();
+		}
+
+		// Everything's gonna need this.
+		Lang::load('ManageBoards');
+
+		// Create the tabs for the template.
+		Menu::$loaded['admin']->tab_data = [
+			'title' => Lang::$txt['boards_and_cats'],
+			'help' => 'manage_boards',
+			'description' => Lang::$txt['boards_and_cats_desc'],
+			'tabs' => [
+				'main' => [
+				],
+				'newcat' => [
+				],
+				'settings' => [
+					'description' => Lang::$txt['mboards_settings_desc'],
+				],
+			],
+		];
+
 		// Have you got the proper permissions?
 		User::$me->isAllowedTo(self::$subactions[$this->subaction][1]);
 
@@ -930,30 +954,6 @@ public static function getConfigVars(): array
 	 */
 	protected function __construct()
 	{
-		// Special handling for modifycat.
-		if (($_REQUEST['action'] ?? '') === 'modifycat') {
-			self::modifyCat();
-		}
-
-		// Everything's gonna need this.
-		Lang::load('ManageBoards');
-
-		// Create the tabs for the template.
-		Menu::$loaded['admin']->tab_data = [
-			'title' => Lang::$txt['boards_and_cats'],
-			'help' => 'manage_boards',
-			'description' => Lang::$txt['boards_and_cats_desc'],
-			'tabs' => [
-				'main' => [
-				],
-				'newcat' => [
-				],
-				'settings' => [
-					'description' => Lang::$txt['mboards_settings_desc'],
-				],
-			],
-		];
-
 		IntegrationHook::call('integrate_manage_boards', [&self::$subactions]);
 
 		// Default to sub action 'main' or 'settings' depending on permissions.

Sources/Actions/Admin/Calendar.php

@@ -86,6 +86,30 @@ class Calendar implements ActionInterface
 	 */
 	public function execute(): void
 	{
+		// Everything's gonna need this.
+		Lang::load('Calendar+ManageCalendar');
+
+		// Set up the two tabs here...
+		Menu::$loaded['admin']->tab_data = [
+			'title' => Lang::$txt['manage_calendar'],
+			'help' => 'calendar',
+			'description' => Lang::$txt['calendar_settings_desc'],
+		];
+
+		if (!empty(Config::$modSettings['cal_enabled'])) {
+			Menu::$loaded['admin']->tab_data['tabs'] = [
+				'holidays' => [
+					'description' => Lang::$txt['manage_holidays_desc'],
+				],
+				'import' => [
+					'description' => Lang::$txt['calendar_import_desc'],
+				],
+				'settings' => [
+					'description' => Lang::$txt['calendar_settings_desc'],
+				],
+			];
+		}
+
 		User::$me->isAllowedTo('admin_forum');
 
 		$call = method_exists($this, self::$subactions[$this->subaction]) ? [$this, self::$subactions[$this->subaction]] : Utils::getCallable(self::$subactions[$this->subaction]);
@@ -634,35 +658,11 @@ public static function getConfigVars(): array
 	 */
 	protected function __construct()
 	{
-		// Everything's gonna need this.
-		Lang::load('Calendar+ManageCalendar');
-
 		if (empty(Config::$modSettings['cal_enabled'])) {
-			unset(self::$subactions['holidays'], self::$subactions['editholiday']);
+			unset(self::$subactions['holidays'], self::$subactions['editholiday'], self::$subactions['import']);
 			$this->subaction = 'settings';
 		}
 
-		// Set up the two tabs here...
-		Menu::$loaded['admin']->tab_data = [
-			'title' => Lang::$txt['manage_calendar'],
-			'help' => 'calendar',
-			'description' => Lang::$txt['calendar_settings_desc'],
-		];
-
-		if (!empty(Config::$modSettings['cal_enabled'])) {
-			Menu::$loaded['admin']->tab_data['tabs'] = [
-				'holidays' => [
-					'description' => Lang::$txt['manage_holidays_desc'],
-				],
-				'import' => [
-					'description' => Lang::$txt['calendar_import_desc'],
-				],
-				'settings' => [
-					'description' => Lang::$txt['calendar_settings_desc'],
-				],
-			];
-		}
-
 		IntegrationHook::call('integrate_manage_calendar', [&self::$subactions]);
 
 		if (!empty($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']])) {

Sources/Actions/Admin/ErrorLog.php

@@ -107,6 +107,14 @@ class ErrorLog implements ActionInterface
 	 */
 	public function execute(): void
 	{
+		// Templates, etc...
+		Lang::load('ManageMaintenance');
+		Theme::loadTemplate('Errors');
+
+		foreach ($this->filters as &$filter) {
+			$filter['txt'] = Lang::$txt[$filter['txt']];
+		}
+
 		// Check for the administrative permission to do this.
 		User::$me->isAllowedTo('admin_forum');
 
@@ -488,20 +496,6 @@ public function viewBacktrace(): void
 	 * Internal methods
 	 ******************/
 
-	/**
-	 * Constructor. Protected to force instantiation via self::load().
-	 */
-	protected function __construct()
-	{
-		// Templates, etc...
-		Lang::load('ManageMaintenance');
-		Theme::loadTemplate('Errors');
-
-		foreach ($this->filters as &$filter) {
-			$filter['txt'] = Lang::$txt[$filter['txt']];
-		}
-	}
-
 	/**
 	 * Delete all or some of the errors in the error log.
 	 *

Sources/Actions/Admin/Features.php

@@ -88,6 +88,8 @@ class Features implements ActionInterface
 	 */
 	public function execute(): void
 	{
+		$this->init();
+
 		// You need to be an admin to edit settings!
 		User::$me->isAllowedTo('admin_forum');
 
@@ -1882,6 +1884,18 @@ public static function list_getProfileFieldSize(): int
 	 * Constructor. Protected to force instantiation via self::load().
 	 */
 	protected function __construct()
+	{
+		IntegrationHook::call('integrate_modify_features', [&self::$subactions]);
+
+		if (!empty($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']])) {
+			$this->subaction = $_REQUEST['sa'];
+		}
+	}
+
+	/**
+	 * Does some initial setup.
+	 */
+	protected function init()
 	{
 		Lang::load('Help');
 		Lang::load('ManageSettings');
@@ -1917,12 +1931,6 @@ protected function __construct()
 				],
 			],
 		];
-
-		IntegrationHook::call('integrate_modify_features', [&self::$subactions]);
-
-		if (!empty($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']])) {
-			$this->subaction = $_REQUEST['sa'];
-		}
 	}
 
 	/**

Sources/Actions/Admin/Languages.php

@@ -81,6 +81,18 @@ class Languages implements ActionInterface
 	 */
 	public function execute(): void
 	{
+		Theme::loadTemplate('ManageLanguages');
+		Lang::load('ManageSettings');
+
+		Utils::$context['page_title'] = Lang::$txt['edit_languages'];
+		Utils::$context['sub_template'] = 'show_settings';
+
+		// Load up all the tabs...
+		Menu::$loaded['admin']->tab_data = [
+			'title' => Lang::$txt['language_configuration'],
+			'description' => Lang::$txt['language_description'],
+		];
+
 		$call = method_exists($this, self::$subactions[$this->subaction]) ? [$this, self::$subactions[$this->subaction]] : Utils::getCallable(self::$subactions[$this->subaction]);
 
 		if (!empty($call)) {
@@ -1614,18 +1626,6 @@ public static function list_getLanguages(): array
 	 */
 	protected function __construct()
 	{
-		Theme::loadTemplate('ManageLanguages');
-		Lang::load('ManageSettings');
-
-		Utils::$context['page_title'] = Lang::$txt['edit_languages'];
-		Utils::$context['sub_template'] = 'show_settings';
-
-		// Load up all the tabs...
-		Menu::$loaded['admin']->tab_data = [
-			'title' => Lang::$txt['language_configuration'],
-			'description' => Lang::$txt['language_description'],
-		];
-
 		IntegrationHook::call('integrate_manage_languages', [&self::$subactions]);
 
 		// By default we're managing languages.