Merge pull request #11003 from annando/fix-api

[friendica.git] / src / Module / Admin / Features.php

diff --git a/src/Module/Admin/Features.php b/src/Module/Admin/Features.php
index 46c0a1384e780cde53b573df6c3b523f3a5b1c41..d2c8e2d83af607e0717f9b3858233935473b95db 100644 (file)
--- a/src/Module/Admin/Features.php
+++ b/src/Module/Admin/Features.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -28,11 +28,11 @@ use Friendica\Module\BaseAdmin;
 
 class Features extends BaseAdmin
 {
-       public static function post(array $parameters = [])
+       public function post()
        {
-               parent::post($parameters);
+               self::checkAdminAccess();
 
-               parent::checkFormSecurityTokenRedirectOnError('/admin/features', 'admin_manage_features');
+               self::checkFormSecurityTokenRedirectOnError('/admin/features', 'admin_manage_features');
 
                $features = Feature::get(false);
 
@@ -60,19 +60,18 @@ class Features extends BaseAdmin
                DI::baseUrl()->redirect('admin/features');
        }
 
-       public static function content(array $parameters = [])
+       public function content(): string
        {
-               parent::content($parameters);
+               parent::content();
 
-               $arr = [];
-               $features = Feature::get(false);
+               $features = [];
 
-               foreach ($features as $fname => $fdata) {
-                       $arr[$fname] = [];
-                       $arr[$fname][0] = $fdata[0];
+               foreach (Feature::get(false) as $fname => $fdata) {
+                       $features[$fname] = [];
+                       $features[$fname][0] = $fdata[0];
                        foreach (array_slice($fdata, 1) as $f) {
                                $set = DI::config()->get('feature', $f[0], $f[3]);
-                               $arr[$fname][1][] = [
+                               $features[$fname][1][] = [
                                        ['feature_' . $f[0], $f[1], $set, $f[2]],
                                        ['featurelock_' . $f[0], DI::l10n()->t('Lock feature %s', $f[1]), $f[4], '']
                                ];
@@ -81,10 +80,11 @@ class Features extends BaseAdmin
 
                $tpl = Renderer::getMarkupTemplate('admin/features.tpl');
                $o = Renderer::replaceMacros($tpl, [
-                       '$form_security_token' => parent::getFormSecurityToken("admin_manage_features"),
-                       '$title' => DI::l10n()->t('Manage Additional Features'),
-                       '$features' => $arr,
-                       '$submit' => DI::l10n()->t('Save Settings'),
+                       '$form_security_token' => self::getFormSecurityToken("admin_manage_features"),
+                       '$baseurl'             => DI::baseUrl()->get(true),
+                       '$title'               => DI::l10n()->t('Manage Additional Features'),
+                       '$features'            => $features,
+                       '$submit'              => DI::l10n()->t('Save Settings'),
                ]);
 
                return $o;