Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-22 07:50:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make BaseModule a real entity

Browse source 
- Add all dependencies, necessary to run the content (baseUrl, Arguments)
- Encapsulate all POST/GET/DELETE/PATCH/PUT methods as protected methods inside the BaseModule
- Return Module content ONLY per `BaseModule::run()` (including the Hook logic there as well)
This commit is contained in:
Philipp 2021-11-20 15:38:03 +01:00
parent 238613fd01
commit 8bdd90066f
No known key found for this signature in database
GPG key ID: 24A7501396EB5432
252 changed files with 615 additions and 623 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/Module/Settings/TwoFactor/Recovery.php
View file

@ -21,13 +21,15 @@
namespace Friendica\Module\Settings\TwoFactor;
use Friendica\App\BaseURL;
use Friendica\App;
use Friendica\Core\L10n;
use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues;
use Friendica\Core\Renderer;
use Friendica\Security\TwoFactor\Model\RecoveryCode;
use Friendica\Module\BaseSettings;
use Friendica\Module\Security\Login;
use Friendica\Util\Profiler;
use Psr\Log\LoggerInterface;
/**
* // Page 3: 2FA enabled but not verified, show recovery codes
@ -38,15 +40,12 @@ class Recovery extends BaseSettings
{
/** @var IManagePersonalConfigValues */
protected $pConfig;
/** @var BaseURL */
protected $baseUrl;
public function __construct(IManagePersonalConfigValues $pConfig, BaseURL $baseUrl, L10n $l10n, array $parameters = [])
public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, IManagePersonalConfigValues $pConfig, array $server, array $parameters = [])
{
parent::__construct($l10n, $parameters);
parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $server, $parameters);
$this->pConfig = $pConfig;
$this->baseUrl = $baseUrl;
if (!local_user()) {
return;
@ -64,7 +63,7 @@ class Recovery extends BaseSettings
}
}
public function post()
protected function post(array $request = [], array $post = [])
{
if (!local_user()) {
return;
@ -81,7 +80,7 @@ class Recovery extends BaseSettings
}
}
public function content(): string
protected function content(array $request = []): string
{
if (!local_user()) {
return Login::form('settings/2fa/recovery');