Use rawContent for Special Options to avoid a protected options() method

[friendica.git] / src / Module / BaseSettings.php

diff --git a/src/Module/BaseSettings.php b/src/Module/BaseSettings.php
index 8621427f7611c0e43b3ac90438e17df4b80255e1..9319662550a8897fe4c630b559815a0c38a75cbe 100644 (file)
--- a/src/Module/BaseSettings.php
+++ b/src/Module/BaseSettings.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -28,10 +28,8 @@ use Friendica\DI;
 
 class BaseSettings extends BaseModule
 {
-       public static function content(array $parameters = [])
+       public static function createAside()
        {
-               $a = DI::app();
-
                $tpl = Renderer::getMarkupTemplate('settings/head.tpl');
                DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [
                        '$ispublic' => DI::l10n()->t('everybody')
@@ -42,21 +40,21 @@ class BaseSettings extends BaseModule
                $tabs[] = [
                        'label' => DI::l10n()->t('Account'),
                        'url' => 'settings',
-                       'selected' => (($a->argc == 1) && ($a->argv[0] === 'settings') ? 'active' : ''),
+                       'selected' => ((DI::args()->getArgc() == 1) && (DI::args()->getArgv() === 'settings') ? 'active' : ''),
                        'accesskey' => 'o',
                ];
 
                $tabs[] = [
                        'label' => DI::l10n()->t('Two-factor authentication'),
                        'url' => 'settings/2fa',
-                       'selected' => (($a->argc > 1) && ($a->argv[1] === '2fa') ? 'active' : ''),
+                       'selected' => ((DI::args()->getArgc() > 1) && (DI::args()->getArgv()[1] === '2fa') ? 'active' : ''),
                        'accesskey' => 'o',
                ];
 
                $tabs[] = [
                        'label' => DI::l10n()->t('Profile'),
                        'url' => 'settings/profile',
-                       'selected' => (($a->argc > 1) && ($a->argv[1] === 'profile') ? 'active' : ''),
+                       'selected' => ((DI::args()->getArgc() > 1) && (DI::args()->getArgv()[1] === 'profile') ? 'active' : ''),
                        'accesskey' => 'p',
                ];
 
@@ -64,7 +62,7 @@ class BaseSettings extends BaseModule
                        $tabs[] = [
                                'label' => DI::l10n()->t('Additional features'),
                                'url' => 'settings/features',
-                               'selected' => (($a->argc > 1) && ($a->argv[1] === 'features') ? 'active' : ''),
+                               'selected' => ((DI::args()->getArgc() > 1) && (DI::args()->getArgv()[1] === 'features') ? 'active' : ''),
                                'accesskey' => 't',
                        ];
                }
@@ -72,49 +70,49 @@ class BaseSettings extends BaseModule
                $tabs[] = [
                        'label' => DI::l10n()->t('Display'),
                        'url' => 'settings/display',
-                       'selected' => (($a->argc > 1) && ($a->argv[1] === 'display') ? 'active' : ''),
+                       'selected' => ((DI::args()->getArgc() > 1) && (DI::args()->getArgv()[1] === 'display') ? 'active' : ''),
                        'accesskey' => 'i',
                ];
 
                $tabs[] = [
                        'label' => DI::l10n()->t('Social Networks'),
                        'url' => 'settings/connectors',
-                       'selected' => (($a->argc > 1) && ($a->argv[1] === 'connectors') ? 'active' : ''),
+                       'selected' => ((DI::args()->getArgc() > 1) && (DI::args()->getArgv()[1] === 'connectors') ? 'active' : ''),
                        'accesskey' => 'w',
                ];
 
                $tabs[] = [
                        'label' => DI::l10n()->t('Addons'),
                        'url' => 'settings/addon',
-                       'selected' => (($a->argc > 1) && ($a->argv[1] === 'addon') ? 'active' : ''),
+                       'selected' => ((DI::args()->getArgc() > 1) && (DI::args()->getArgv()[1] === 'addon') ? 'active' : ''),
                        'accesskey' => 'l',
                ];
 
                $tabs[] = [
-                       'label' => DI::l10n()->t('Delegations'),
+                       'label' => DI::l10n()->t('Manage Accounts'),
                        'url' => 'settings/delegation',
-                       'selected' => (($a->argc > 1) && ($a->argv[1] === 'delegation') ? 'active' : ''),
+                       'selected' => ((DI::args()->getArgc() > 1) && (DI::args()->getArgv()[1] === 'delegation') ? 'active' : ''),
                        'accesskey' => 'd',
                ];
 
                $tabs[] = [
                        'label' => DI::l10n()->t('Connected apps'),
                        'url' => 'settings/oauth',
-                       'selected' => (($a->argc > 1) && ($a->argv[1] === 'oauth') ? 'active' : ''),
+                       'selected' => ((DI::args()->getArgc() > 1) && (DI::args()->getArgv()[1] === 'oauth') ? 'active' : ''),
                        'accesskey' => 'b',
                ];
 
                $tabs[] = [
                        'label' => DI::l10n()->t('Export personal data'),
                        'url' => 'settings/userexport',
-                       'selected' => (($a->argc > 1) && ($a->argv[1] === 'userexport') ? 'active' : ''),
+                       'selected' => ((DI::args()->getArgc() > 1) && (DI::args()->getArgv()[1] === 'userexport') ? 'active' : ''),
                        'accesskey' => 'e',
                ];
 
                $tabs[] = [
                        'label' => DI::l10n()->t('Remove account'),
                        'url' => 'removeme',
-                       'selected' => (($a->argc == 1) && ($a->argv[0] === 'removeme') ? 'active' : ''),
+                       'selected' => ((DI::args()->getArgc() == 1) && (DI::args()->getArgv() === 'removeme') ? 'active' : ''),
                        'accesskey' => 'r',
                ];
 
@@ -126,4 +124,13 @@ class BaseSettings extends BaseModule
                        '$items' => $tabs,
                ]);
        }
+
+       protected function content(array $request = []): string
+       {
+               $a = DI::app();
+
+               static::createAside();
+
+               return '';
+       }
 }