Make the site admin theme setting link go to the currently selected theme

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

diff --git a/src/Module/BaseAdminModule.php b/src/Module/BaseAdminModule.php
index 44ef39113fb4983ca5f83090c1fd59dba6c83f51..140f1223eeffaa536ce485e58a7fb9946e0dba51 100644 (file)
--- a/src/Module/BaseAdminModule.php
+++ b/src/Module/BaseAdminModule.php
@@ -5,6 +5,7 @@ namespace Friendica\Module;
 use Friendica\BaseModule;\r
 use Friendica\Core\L10n;\r
 use Friendica\Core\Renderer;\r
+use Friendica\Core\System;\r
 use Friendica\Database\DBA;\r
 \r
 abstract class BaseAdminModule extends BaseModule\r
@@ -21,6 +22,19 @@ abstract class BaseAdminModule extends BaseModule
                }\r
        }\r
 \r
+       public static function rawContent()\r
+       {\r
+               if (!is_site_admin()) {\r
+                       System::httpExit(403);\r
+               }\r
+\r
+               if (!empty($_SESSION['submanage'])) {\r
+                       System::httpExit(403);\r
+               }\r
+\r
+               return '';\r
+       }\r
+\r
        public static function content()\r
        {\r
                if (!is_site_admin()) {\r
@@ -53,10 +67,34 @@ abstract class BaseAdminModule extends BaseModule
                                'federation'   => ['admin/federation'  , L10n::t('Federation Statistics')   , 'federation']\r
                        ]],\r
                        'configuration' => [L10n::t('Configuration'), [\r
+                               'site'         => ['admin/site'        , L10n::t('Site')                    , 'site'],\r
+                               'users'        => ['admin/users'       , L10n::t('Users')                   , 'users'],\r
                                'addons'       => ['admin/addons'      , L10n::t('Addons')                  , 'addons'],\r
                                'themes'       => ['admin/themes'      , L10n::t('Themes')                  , 'themes'],\r
+                               'features'     => ['admin/features'    , L10n::t('Additional features')     , 'features'],\r
                                'tos'          => ['admin/tos'         , L10n::t('Terms of Service')        , 'tos'],\r
                        ]],\r
+                       'database' => [L10n::t('Database'), [\r
+                               'dbsync'       => ['admin/dbsync'      , L10n::t('DB updates')              , 'dbsync'],\r
+                               'deferred'     => ['admin/queue/deferred', L10n::t('Inspect Deferred Workers'), 'deferred'],\r
+                               'workerqueue'  => ['admin/queue'       , L10n::t('Inspect worker Queue')    , 'workerqueue'],\r
+                       ]],\r
+                       'tools' => [L10n::t('Tools'), [\r
+                               'contactblock' => ['admin/blocklist/contact', L10n::t('Contact Blocklist')  , 'contactblock'],\r
+                               'blocklist'    => ['admin/blocklist/server' , L10n::t('Server Blocklist')   , 'blocklist'],\r
+                               'deleteitem'   => ['admin/item/delete' , L10n::t('Delete Item')             , 'deleteitem'],\r
+                       ]],\r
+                       'logs' => [L10n::t('Logs'), [\r
+                               'logsconfig'   => ['admin/logs/', L10n::t('Logs')                           , 'logs'],\r
+                               'logsview'     => ['admin/logs/view'    , L10n::t('View Logs')              , 'viewlogs'],\r
+                       ]],\r
+                       'diagnostics' => [L10n::t('Diagnostics'), [\r
+                               'phpinfo'      => ['admin/phpinfo'           , L10n::t('PHP Info')          , 'phpinfo'],\r
+                               'probe'        => ['probe'             , L10n::t('probe address')           , 'probe'],\r
+                               'webfinger'    => ['webfinger'         , L10n::t('check webfinger')         , 'webfinger'],\r
+                               'itemsource'   => ['admin/item/source' , L10n::t('Item Source')             , 'itemsource'],\r
+                               'babel'        => ['babel'             , L10n::t('Babel')                   , 'babel'],\r
+                       ]],\r
                ];\r
 \r
                $addons_admin = [];\r