mirror of
https://github.com/friendica/friendica
synced 2025-04-24 04:30:11 +00:00
Move settings/oauth to src/Module
- Add settings_content() permission checks to Module\BaseSettings - Transform application token deletion GET links to POST forms to keep a single OAuth module class
This commit is contained in:
Hypolite Petovan
parent
55365aa4da
commit
3226b00995
6 changed files with 185 additions and 79 deletions
|
|
@ -21,116 +21,156 @@
|
|||
|
||||
namespace Friendica\Module;
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\BaseModule;
|
||||
use Friendica\Content\Feature;
|
||||
use Friendica\Content\Nav;
|
||||
use Friendica\Core\L10n;
|
||||
use Friendica\Core\Renderer;
|
||||
use Friendica\DI;
|
||||
use Friendica\Core\Session\Capability\IHandleUserSessions;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Module\Security\Login;
|
||||
use Friendica\Network\HTTPException\ForbiddenException;
|
||||
use Friendica\Util\Profiler;
|
||||
use Psr\Log\LoggerInterface;
|
||||
|
||||
class BaseSettings extends BaseModule
|
||||
{
|
||||
public static function createAside()
|
||||
/** @var App\Page */
|
||||
protected $page;
|
||||
/** @var IHandleUserSessions */
|
||||
protected $session;
|
||||
|
||||
public function __construct(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($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
|
||||
|
||||
$this->page = $page;
|
||||
$this->session = $session;
|
||||
|
||||
if ($this->session->getSubManagedUserId()) {
|
||||
throw new ForbiddenException($this->t('Permission denied.'));
|
||||
}
|
||||
}
|
||||
|
||||
protected function content(array $request = []): string
|
||||
{
|
||||
Nav::setSelected('settings');
|
||||
|
||||
if (!$this->session->getLocalUserId()) {
|
||||
$this->session->set('return_path', $this->args->getCommand());
|
||||
$this->baseUrl->redirect('login');
|
||||
}
|
||||
|
||||
$this->createAside();
|
||||
|
||||
return '';
|
||||
}
|
||||
|
||||
public function createAside()
|
||||
{
|
||||
$tpl = Renderer::getMarkupTemplate('settings/head.tpl');
|
||||
DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [
|
||||
'$ispublic' => DI::l10n()->t('everybody')
|
||||
$this->page['htmlhead'] .= Renderer::replaceMacros($tpl, [
|
||||
'$ispublic' => $this->t('everybody')
|
||||
]);
|
||||
|
||||
$tabs = [];
|
||||
|
||||
$tabs[] = [
|
||||
'label' => DI::l10n()->t('Account'),
|
||||
'url' => 'settings',
|
||||
'selected' => ((DI::args()->getArgc() == 1) && (DI::args()->getArgv() === 'settings') ? 'active' : ''),
|
||||
'label' => $this->t('Account'),
|
||||
'url' => 'settings',
|
||||
'selected' => static::class == Settings\Account::class ? 'active' : '',
|
||||
'accesskey' => 'o',
|
||||
];
|
||||
|
||||
$tabs[] = [
|
||||
'label' => DI::l10n()->t('Two-factor authentication'),
|
||||
'url' => 'settings/2fa',
|
||||
'selected' => ((DI::args()->getArgc() > 1) && (DI::args()->getArgv()[1] === '2fa') ? 'active' : ''),
|
||||
'label' => $this->t('Two-factor authentication'),
|
||||
'url' => 'settings/2fa',
|
||||
'selected' => in_array(static::class, [
|
||||
Settings\TwoFactor\AppSpecific::class,
|
||||
Settings\TwoFactor\Index::class,
|
||||
Settings\TwoFactor\Recovery::class,
|
||||
Settings\TwoFactor\Trusted::class,
|
||||
Settings\TwoFactor\Verify::class
|
||||
]) ? 'active' : '',
|
||||
'accesskey' => '2',
|
||||
];
|
||||
|
||||
$tabs[] = [
|
||||
'label' => DI::l10n()->t('Profile'),
|
||||
'url' => 'settings/profile',
|
||||
'selected' => ((DI::args()->getArgc() > 1) && (DI::args()->getArgv()[1] === 'profile') ? 'active' : ''),
|
||||
'label' => $this->t('Profile'),
|
||||
'url' => 'settings/profile',
|
||||
'selected' => in_array(static::class, [
|
||||
Settings\Profile\Index::class,
|
||||
Settings\Profile\Photo\Crop::class,
|
||||
Settings\Profile\Photo\Index::class,
|
||||
]) ? 'active' : '',
|
||||
'accesskey' => 'p',
|
||||
];
|
||||
|
||||
if (Feature::get()) {
|
||||
$tabs[] = [
|
||||
'label' => DI::l10n()->t('Additional features'),
|
||||
'url' => 'settings/features',
|
||||
'selected' => ((DI::args()->getArgc() > 1) && (DI::args()->getArgv()[1] === 'features') ? 'active' : ''),
|
||||
'label' => $this->t('Additional features'),
|
||||
'url' => 'settings/features',
|
||||
'selected' => static::class == Settings\Features::class ? 'active' : '',
|
||||
'accesskey' => 't',
|
||||
];
|
||||
}
|
||||
|
||||
$tabs[] = [
|
||||
'label' => DI::l10n()->t('Display'),
|
||||
'url' => 'settings/display',
|
||||
'selected' => ((DI::args()->getArgc() > 1) && (DI::args()->getArgv()[1] === 'display') ? 'active' : ''),
|
||||
'label' => $this->t('Display'),
|
||||
'url' => 'settings/display',
|
||||
'selected' => static::class == Settings\Display::class ? 'active' : '',
|
||||
'accesskey' => 'i',
|
||||
];
|
||||
|
||||
$tabs[] = [
|
||||
'label' => DI::l10n()->t('Social Networks'),
|
||||
'url' => 'settings/connectors',
|
||||
'selected' => ((DI::args()->getArgc() > 1) && (DI::args()->getArgv()[1] === 'connectors') ? 'active' : ''),
|
||||
'label' => $this->t('Social Networks'),
|
||||
'url' => 'settings/connectors',
|
||||
'selected' => static::class == Settings\SocialNetworks::class ? 'active' : '',
|
||||
'accesskey' => 'w',
|
||||
];
|
||||
|
||||
$tabs[] = [
|
||||
'label' => DI::l10n()->t('Addons'),
|
||||
'url' => 'settings/addon',
|
||||
'selected' => ((DI::args()->getArgc() > 1) && (DI::args()->getArgv()[1] === 'addon') ? 'active' : ''),
|
||||
'label' => $this->t('Addons'),
|
||||
'url' => 'settings/addon',
|
||||
'selected' => static::class == Settings\Addons::class ? 'active' : '',
|
||||
'accesskey' => 'l',
|
||||
];
|
||||
|
||||
$tabs[] = [
|
||||
'label' => DI::l10n()->t('Manage Accounts'),
|
||||
'url' => 'settings/delegation',
|
||||
'selected' => ((DI::args()->getArgc() > 1) && (DI::args()->getArgv()[1] === 'delegation') ? 'active' : ''),
|
||||
'label' => $this->t('Manage Accounts'),
|
||||
'url' => 'settings/delegation',
|
||||
'selected' => static::class == Settings\Delegation::class ? 'active' : '',
|
||||
'accesskey' => 'd',
|
||||
];
|
||||
|
||||
$tabs[] = [
|
||||
'label' => DI::l10n()->t('Connected apps'),
|
||||
'url' => 'settings/oauth',
|
||||
'selected' => ((DI::args()->getArgc() > 1) && (DI::args()->getArgv()[1] === 'oauth') ? 'active' : ''),
|
||||
'label' => $this->t('Connected apps'),
|
||||
'url' => 'settings/oauth',
|
||||
'selected' => static::class == Settings\OAuth::class ? 'active' : '',
|
||||
'accesskey' => 'b',
|
||||
];
|
||||
|
||||
$tabs[] = [
|
||||
'label' => DI::l10n()->t('Export personal data'),
|
||||
'url' => 'settings/userexport',
|
||||
'selected' => ((DI::args()->getArgc() > 1) && (DI::args()->getArgv()[1] === 'userexport') ? 'active' : ''),
|
||||
'label' => $this->t('Export personal data'),
|
||||
'url' => 'settings/userexport',
|
||||
'selected' => static::class == Settings\UserExport::class ? 'active' : '',
|
||||
'accesskey' => 'e',
|
||||
];
|
||||
|
||||
$tabs[] = [
|
||||
'label' => DI::l10n()->t('Remove account'),
|
||||
'url' => 'settings/removeme',
|
||||
'selected' => static::class === Settings\RemoveMe::class ? 'active' : '',
|
||||
'label' => $this->t('Remove account'),
|
||||
'url' => 'settings/removeme',
|
||||
'selected' => static::class === Settings\RemoveMe::class ? 'active' : '',
|
||||
'accesskey' => 'r',
|
||||
];
|
||||
|
||||
|
||||
$tabtpl = Renderer::getMarkupTemplate("generic_links_widget.tpl");
|
||||
DI::page()['aside'] = Renderer::replaceMacros($tabtpl, [
|
||||
'$title' => DI::l10n()->t('Settings'),
|
||||
$tabtpl = Renderer::getMarkupTemplate('generic_links_widget.tpl');
|
||||
$this->page['aside'] = Renderer::replaceMacros($tabtpl, [
|
||||
'$title' => $this->t('Settings'),
|
||||
'$class' => 'settings-widget',
|
||||
'$items' => $tabs,
|
||||
]);
|
||||
}
|
||||
|
||||
protected function content(array $request = []): string
|
||||
{
|
||||
$a = DI::app();
|
||||
|
||||
static::createAside();
|
||||
|
||||
return '';
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue