Remove unused `use` statements & remove PConfig class

[friendica.git] / src / Model / Photo.php

diff --git a/src/Model/Photo.php b/src/Model/Photo.php
index 8df06565bc52b5baef652cbe7026205bb78596a5..e70ac2d97bda1c9a1493d2c1ac2b70719ea38523 100644 (file)
--- a/src/Model/Photo.php
+++ b/src/Model/Photo.php
@@ -6,16 +6,14 @@
  */
 namespace Friendica\Model;
 
-use Friendica\Core\Cache;
+use Friendica\Core\Cache\Cache;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\StorageManager;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Database\DBStructure;
 use Friendica\DI;
-use Friendica\Model\Storage\IStorage;
 use Friendica\Model\Storage\SystemResource;
 use Friendica\Object\Image;
 use Friendica\Util\DateTimeFormat;
@@ -173,7 +171,8 @@ class Photo
         */
        public static function getImageForPhoto(array $photo)
        {
-               if (empty($photo['backend-class'])) {
+               $backendClass = DI::storageManager()->getByName($photo['backend-class'] ?? '');
+               if ($backendClass === null) {
                        // legacy data storage in "data" column
                        $i = self::selectFirst(['data'], ['id' => $photo['id']]);
                        if ($i === false) {
@@ -181,7 +180,6 @@ class Photo
                        }
                        $data = $i['data'];
                } else {
-                       $backendClass = DI::facStorage()->getByName($photo['backend-class'] ?? '');
                        $backendRef = $photo['backend-ref'] ?? '';
                        $data = $backendClass->get($backendRef);
                }
@@ -274,7 +272,7 @@ class Photo
 
                if (DBA::isResult($existing_photo)) {
                        $backend_ref = (string)$existing_photo["backend-ref"];
-                       $storage = DI::facStorage()->getByName($existing_photo["backend-class"] ?? '');
+                       $storage = DI::storageManager()->getByName($existing_photo["backend-class"] ?? '');
                } else {
                        $storage = DI::storage();
                }
@@ -338,7 +336,7 @@ class Photo
                $photos = self::selectToArray(['backend-class', 'backend-ref'], $conditions);
 
                foreach($photos as $photo) {
-                       $backend_class = DI::facStorage()->getByName($photo['backend-class'] ?? '');
+                       $backend_class = DI::storageManager()->getByName($photo['backend-class'] ?? '');
                        if ($backend_class !== null) {
                                $backend_class->delete($photo["backend-ref"] ?? '');
                        }
@@ -367,7 +365,7 @@ class Photo
                        $photos = self::selectToArray(['backend-class', 'backend-ref'], $conditions);
 
                        foreach($photos as $photo) {
-                               $backend_class = DI::facStorage()->getByName($photo['backend-class'] ?? '');
+                               $backend_class = DI::storageManager()->getByName($photo['backend-class'] ?? '');
                                if ($backend_class !== null) {
                                        $fields["backend-ref"] = $backend_class->put($img->asString(), $photo['backend-ref']);
                                } else {
@@ -542,7 +540,7 @@ class Photo
                $sql_extra = Security::getPermissionsSQLByUserId($uid);
 
                $key = "photo_albums:".$uid.":".local_user().":".remote_user();
-               $albums = Cache::get($key);
+               $albums = DI::cache()->get($key);
                if (is_null($albums) || $update) {
                        if (!Config::get("system", "no_count", false)) {
                                /// @todo This query needs to be renewed. It is really slow
@@ -565,7 +563,7 @@ class Photo
                                        DBA::escape(L10n::t("Contact Photos"))
                                );
                        }
-                       Cache::set($key, $albums, Cache::DAY);
+                       DI::cache()->set($key, $albums, Cache::DAY);
                }
                return $albums;
        }
@@ -578,7 +576,7 @@ class Photo
        public static function clearAlbumCache($uid)
        {
                $key = "photo_albums:".$uid.":".local_user().":".remote_user();
-               Cache::set($key, null, Cache::DAY);
+               DI::cache()->set($key, null, Cache::DAY);
        }
 
        /**
@@ -592,6 +590,25 @@ class Photo
                return System::createGUID(32, false);
        }
 
+       /**
+        * Extracts the rid from a local photo URI
+        *
+        * @param string $image_uri The URI of the photo
+        * @return string The rid of the photo, or an empty string if the URI is not local
+        */
+       public static function ridFromURI(string $image_uri)
+       {
+               if (!stristr($image_uri, DI::baseUrl() . '/photo/')) {
+                       return '';
+               }
+               $image_uri = substr($image_uri, strrpos($image_uri, '/') + 1);
+               $image_uri = substr($image_uri, 0, strpos($image_uri, '-'));
+               if (!strlen($image_uri)) {
+                       return '';
+               }
+               return $image_uri;
+       }
+
        /**
         * Changes photo permissions that had been embedded in a post
         *
@@ -618,12 +635,8 @@ class Photo
                }
 
                foreach ($images as $image) {
-                       if (!stristr($image, DI::baseUrl() . '/photo/')) {
-                               continue;
-                       }
-                       $image_uri = substr($image,strrpos($image,'/') + 1);
-                       $image_uri = substr($image_uri,0, strpos($image_uri,'-'));
-                       if (!strlen($image_uri)) {
+                       $image_rid = self::ridFromURI($image);
+                       if (empty($image_rid)) {
                                continue;
                        }
 
@@ -632,7 +645,7 @@ class Photo
 
                        $condition = [
                                'allow_cid' => $srch, 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '',
-                               'resource-id' => $image_uri, 'uid' => $uid
+                               'resource-id' => $image_rid, 'uid' => $uid
                        ];
                        if (!Photo::exists($condition)) {
                                continue;
@@ -642,7 +655,7 @@ class Photo
 
                        $fields = ['allow_cid' => $str_contact_allow, 'allow_gid' => $str_group_allow,
                                        'deny_cid' => $str_contact_deny, 'deny_gid' => $str_group_deny];
-                       $condition = ['resource-id' => $image_uri, 'uid' => $uid];
+                       $condition = ['resource-id' => $image_rid, 'uid' => $uid];
                        Logger::info('Set permissions', ['condition' => $condition, 'permissions' => $fields]);
                        Photo::update($fields, $condition);
                }