Merge pull request #12922 from annando/nomad-version

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

diff --git a/src/Module/Admin/Storage.php b/src/Module/Admin/Storage.php
index d0d9c3aa4efd00d926ed1e50dfa58d7972d5b55b..71d34cb25de6fc03fae490d310bd20a19a2bf53d 100644 (file)
--- a/src/Module/Admin/Storage.php
+++ b/src/Module/Admin/Storage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -31,19 +31,19 @@ use Friendica\Util\Strings;
 
 class Storage extends BaseAdmin
 {
-       public function post()
+       protected function post(array $request = [])
        {
                self::checkAdminAccess();
 
                self::checkFormSecurityTokenRedirectOnError('/admin/storage', 'admin_storage');
 
-               $storagebackend = trim(static::$parameters['name'] ?? '');
+               $storagebackend = trim($this->parameters['name'] ?? '');
 
                try {
                        /** @var ICanConfigureStorage|false $newStorageConfig */
                        $newStorageConfig = DI::storageManager()->getConfigurationByName($storagebackend);
                } catch (InvalidClassStorageException $storageException) {
-                       notice(DI::l10n()->t('Storage backend, %s is invalid.', $storagebackend));
+                       DI::sysmsg()->addNotice(DI::l10n()->t('Storage backend, %s is invalid.', $storagebackend));
                        DI::baseUrl()->redirect('admin/storage');
                }
 
@@ -70,7 +70,7 @@ class Storage extends BaseAdmin
                        $storage_form_errors = $newStorageConfig->saveOptions($storage_opts_data);
                        if (count($storage_form_errors)) {
                                foreach ($storage_form_errors as $name => $err) {
-                                       notice(DI::l10n()->t('Storage backend %s error: %s', $storage_opts[$name][1], $err));
+                                       DI::sysmsg()->addNotice(DI::l10n()->t('Storage backend %s error: %s', $storage_opts[$name][1], $err));
                                }
                                DI::baseUrl()->redirect('admin/storage');
                        }
@@ -81,17 +81,17 @@ class Storage extends BaseAdmin
                                $newstorage = DI::storageManager()->getWritableStorageByName($storagebackend);
 
                                if (!DI::storageManager()->setBackend($newstorage)) {
-                                       notice(DI::l10n()->t('Invalid storage backend setting value.'));
+                                       DI::sysmsg()->addNotice(DI::l10n()->t('Invalid storage backend setting value.'));
                                }
                        } catch (InvalidClassStorageException $storageException) {
-                               notice(DI::l10n()->t('Invalid storage backend setting value.'));
+                               DI::sysmsg()->addNotice(DI::l10n()->t('Invalid storage backend setting value.'));
                        }
                }
 
                DI::baseUrl()->redirect('admin/storage');
        }
 
-       public function content(): string
+       protected function content(array $request = []): string
        {
                parent::content();
 
@@ -144,7 +144,6 @@ class Storage extends BaseAdmin
                        '$use'                   => DI::l10n()->t('Use storage backend'),
                        '$save_reload'           => DI::l10n()->t('Save & Reload'),
                        '$noconfig'              => DI::l10n()->t('This backend doesn\'t have custom settings'),
-                       '$baseurl'               => DI::baseUrl()->get(true),
                        '$form_security_token'   => self::getFormSecurityToken("admin_storage"),
                        '$storagebackend'        => $current_storage_backend instanceof ICanWriteToStorage ? $current_storage_backend::getName() : DI::l10n()->t('Database (legacy)'),
                        '$availablestorageforms' => $available_storage_forms,