Merge pull request #10446 from MrPetovan/bug/10439-addon-settings-forms

[friendica.git] / src / Core / StorageManager.php

diff --git a/src/Core/StorageManager.php b/src/Core/StorageManager.php
index c8385783e9f4c1bebe3d6e0041a5eebebc4b6926..64e53c10b9f1f62883fa28c23919809774c8947e 100644 (file)
--- a/src/Core/StorageManager.php
+++ b/src/Core/StorageManager.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
  *
@@ -25,6 +25,7 @@ use Exception;
 use Friendica\Core\Config\IConfig;
 use Friendica\Database\Database;
 use Friendica\Model\Storage;
+use Friendica\Network\IHTTPRequest;
 use Psr\Log\LoggerInterface;
 
 
@@ -60,6 +61,8 @@ class StorageManager
        private $logger;
        /** @var L10n */
        private $l10n;
+       /** @var IHTTPRequest */
+       private $httpRequest;
 
        /** @var Storage\IStorage */
        private $currentBackend;
@@ -70,12 +73,13 @@ class StorageManager
         * @param LoggerInterface $logger
         * @param L10n            $l10n
         */
-       public function __construct(Database $dba, IConfig $config, LoggerInterface $logger, L10n $l10n)
+       public function __construct(Database $dba, IConfig $config, LoggerInterface $logger, L10n $l10n, IHTTPRequest $httpRequest)
        {
-               $this->dba      = $dba;
-               $this->config   = $config;
-               $this->logger   = $logger;
-               $this->l10n     = $l10n;
+               $this->dba         = $dba;
+               $this->config      = $config;
+               $this->logger      = $logger;
+               $this->l10n        = $l10n;
+               $this->httpRequest = $httpRequest;
                $this->backends = $config->get('storage', 'backends', self::DEFAULT_BACKENDS);
 
                $currentName = $this->config->get('storage', 'name', '');
@@ -126,6 +130,9 @@ class StorageManager
                                        case Storage\SystemResource::getName():
                                                $this->backendInstances[$name] = new Storage\SystemResource();
                                                break;
+                                       case Storage\ExternalResource::getName():
+                                               $this->backendInstances[$name] = new Storage\ExternalResource($this->httpRequest);
+                                               break;
                                        default:
                                                $data = [
                                                        'name'    => $name,
@@ -158,7 +165,7 @@ class StorageManager
        public function isValidBackend(string $name = null, bool $onlyUserBackend = false)
        {
                return array_key_exists($name, $this->backends) ||
-                      (!$onlyUserBackend && $name === Storage\SystemResource::getName());
+                      (!$onlyUserBackend && in_array($name, [Storage\SystemResource::getName(), Storage\ExternalResource::getName()]));
        }
 
        /**
@@ -305,13 +312,13 @@ class StorageManager
                                        $data = $source->get($sourceRef);
                                }
 
-                               $this->logger->info('Save data to new backend.', ['newBackend' => $destination]);
+                               $this->logger->info('Save data to new backend.', ['newBackend' => $destination::getName()]);
                                $destinationRef = $destination->put($data);
                                $this->logger->info('Saved data.', ['newReference' => $destinationRef]);
 
                                if ($destinationRef !== '') {
                                        $this->logger->info('update row');
-                                       if ($this->dba->update($table, ['backend-class' => $destination, 'backend-ref' => $destinationRef, 'data' => ''], ['id' => $id])) {
+                                       if ($this->dba->update($table, ['backend-class' => $destination::getName(), 'backend-ref' => $destinationRef, 'data' => ''], ['id' => $id])) {
                                                if (!empty($source)) {
                                                        $this->logger->info('Delete data from old backend.', ['oldBackend' => $source, 'oldReference' => $sourceRef]);
                                                        $source->delete($sourceRef);