Move settings/addons to src/Module

doc/Connectors.md

@@ -9,8 +9,8 @@ There is also a connector for accessing your email INBOX.
 
 If the following network connectors are installed on your system, select the following links to visit the appropriate settings page and configure them for your account:
 
-* [Twitter](/settings/addon)
-* [GNU Social](/settings/addon)
+* [Twitter](/settings/addons)
+* [GNU Social](/settings/addons)
 * [Email](/settings)
 
 Instructions For Connecting To People On Specific Services

mod/settings.php

@@ -55,14 +55,6 @@ function settings_post(App $a)
 		return;
 	}
 
-	if ((DI::args()->getArgc() > 1) && (DI::args()->getArgv()[1] == 'addon')) {
-		BaseModule::checkFormSecurityTokenRedirectOnError(DI::args()->getQueryString(), 'settings_addon');
-
-		Hook::callAll('addon_settings_post', $_POST);
-		DI::baseUrl()->redirect(DI::args()->getQueryString());
-		return;
-	}
-
 	$user = User::getById($a->getLoggedInUserId());
 
 	if ((DI::args()->getArgc() > 1) && (DI::args()->getArgv()[1] == 'connectors')) {
@@ -157,41 +149,6 @@ function settings_content(App $a)
 		return '';
 	}
 
-	if ((DI::args()->getArgc() > 1) && (DI::args()->getArgv()[1] === 'addon')) {
-		$addon_settings_forms = [];
-		foreach (DI::dba()->selectToArray('hook', ['file', 'function'], ['hook' => 'addon_settings']) as $hook) {
-			$data = [];
-			Hook::callSingle(DI::app(), 'addon_settings', [$hook['file'], $hook['function']], $data);
-
-			if (!empty($data['href'])) {
-				$tpl = Renderer::getMarkupTemplate('settings/addon/link.tpl');
-				$addon_settings_forms[] = Renderer::replaceMacros($tpl, [
-					'$addon' => $data['addon'],
-					'$title' => $data['title'],
-					'$href'  => $data['href'],
-				]);
-			} elseif(!empty($data['addon'])) {
-				$tpl = Renderer::getMarkupTemplate('settings/addon/panel.tpl');
-				$addon_settings_forms[$data['addon']] = Renderer::replaceMacros($tpl, [
-					'$addon'  => $data['addon'],
-					'$title'  => $data['title'],
-					'$open'   => (DI::args()->getArgv()[2] ?? '') === $data['addon'],
-					'$html'   => $data['html'] ?? '',
-					'$submit' => $data['submit'] ?? DI::l10n()->t('Save Settings'),
-				]);
-			}
-		}
-
-		$tpl = Renderer::getMarkupTemplate('settings/addons.tpl');
-		$o .= Renderer::replaceMacros($tpl, [
-			'$form_security_token' => BaseModule::getFormSecurityToken("settings_addon"),
-			'$title'	=> DI::l10n()->t('Addon Settings'),
-			'$no_addons_settings_configured' => DI::l10n()->t('No Addon settings configured'),
-			'$addon_settings_forms' => $addon_settings_forms,
-		]);
-		return $o;
-	}
-
 	if ((DI::args()->getArgc() > 1) && (DI::args()->getArgv()[1] === 'features')) {
 
 		$arr = [];

src/Module/BaseSettings.php

@@ -132,7 +132,7 @@ class BaseSettings extends BaseModule
 
 		$tabs[] = [
 			'label'     => $this->t('Addons'),
-			'url'       => 'settings/addon',
+			'url'       => 'settings/addons',
 			'selected'  => static::class == Settings\Addons::class ? 'active' : '',
 			'accesskey' => 'l',
 		];

src/Module/Settings/Addons.php

@@ -0,0 +1,94 @@
+<?php
+/**
+ * @copyright Copyright (C) 2010-2022, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace Friendica\Module\Settings;
+
+use Friendica\App;
+use Friendica\Core\Hook;
+use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
+use Friendica\Core\Session\Capability\IHandleUserSessions;
+use Friendica\Database\Database;
+use Friendica\Module\BaseSettings;
+use Friendica\Module\Response;
+use Friendica\Util\Profiler;
+use Psr\Log\LoggerInterface;
+
+class Addons extends BaseSettings
+{
+	/** @var Database */
+	private $database;
+	/** @var App */
+	private $app;
+
+	public function __construct(App $app, Database $database, IHandleUserSessions $session, App\Page $page, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
+	{
+		parent::__construct($session, $page, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+
+		$this->database = $database;
+		$this->app      = $app;
+	}
+
+	protected function post(array $request = [])
+	{
+		BaseSettings::checkFormSecurityTokenRedirectOnError($this->args->getQueryString(), 'settings_addon');
+
+		Hook::callAll('addon_settings_post', $request);
+		$this->baseUrl->redirect($this->args->getQueryString());
+	}
+
+	protected function content(array $request = []): string
+	{
+		parent::content($request); // TODO: Change the autogenerated stub
+
+		$addon_settings_forms = [];
+		foreach ($this->database->selectToArray('hook', ['file', 'function'], ['hook' => 'addon_settings']) as $hook) {
+			$data = [];
+			Hook::callSingle($this->app, 'addon_settings', [$hook['file'], $hook['function']], $data);
+
+			if (!empty($data['href'])) {
+				$tpl                    = Renderer::getMarkupTemplate('settings/addons/link.tpl');
+				$addon_settings_forms[] = Renderer::replaceMacros($tpl, [
+					'$addon' => $data['addon'],
+					'$title' => $data['title'],
+					'$href'  => $data['href'],
+				]);
+			} elseif (!empty($data['addon'])) {
+				$tpl                                  = Renderer::getMarkupTemplate('settings/addons/panel.tpl');
+				$addon_settings_forms[$data['addon']] = Renderer::replaceMacros($tpl, [
+					'$addon'  => $data['addon'],
+					'$title'  => $data['title'],
+					'$open'   => ($this->parameters['addon'] ?? '') === $data['addon'],
+					'$html'   => $data['html'] ?? '',
+					'$submit' => $data['submit'] ?? $this->t('Save Settings'),
+				]);
+			}
+		}
+
+		$tpl = Renderer::getMarkupTemplate('settings/addons.tpl');
+		return Renderer::replaceMacros($tpl, [
+			'$form_security_token'           => BaseSettings::getFormSecurityToken('settings_addon'),
+			'$title'                         => $this->t('Addon Settings'),
+			'$no_addons_settings_configured' => $this->t('No Addon settings configured'),
+			'$addon_settings_forms'          => $addon_settings_forms,
+		]);
+	}
+}

static/routes.config.php

@@ -592,6 +592,7 @@ return [
 			'[/]'     => [Module\Settings\Account::class,               [R::GET, R::POST]],
 			'/{open}' => [Module\Settings\Account::class,               [R::GET, R::POST]],
 		],
+		'/addons[/{addon}]' => [Module\Settings\Addons::class,                [R::GET, R::POST]],
 		'/2fa' => [
 			'[/]'           => [Module\Settings\TwoFactor\Index::class,       [R::GET, R::POST]],
 			'/recovery'     => [Module\Settings\TwoFactor\Recovery::class,    [R::GET, R::POST]],

view/templates/settings/addons.tpl

@@ -2,7 +2,7 @@
 
 {{foreach $addon_settings_forms as $addon => $addon_settings_form}}
 
-<form action="settings/addon/{{$addon}}" method="post" autocomplete="off">
+<form action="settings/addons/{{$addon}}" method="post" autocomplete="off">
 	<input type="hidden" name="form_security_token" value="{{$form_security_token}}">
 	{{$addon_settings_form nofilter}}
 </form>

view/theme/frio/templates/settings/addons.tpl

@@ -4,7 +4,7 @@
 
 	<div class="panel-group panel-group-settings" id="settings-addons" role="tablist" aria-multiselectable="true">
 {{foreach $addon_settings_forms as $addon => $addon_settings_form}}
-		<form action="settings/addon/{{$addon}}" method="post" autocomplete="off" class="panel">
+		<form action="settings/addons/{{$addon}}" method="post" autocomplete="off" class="panel">
 			<input type="hidden" name="form_security_token" value="{{$form_security_token}}">
 			{{$addon_settings_form nofilter}}
 		</form>