Use rawContent for Special Options to avoid a protected options() method

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

diff --git a/src/Model/Photo.php b/src/Model/Photo.php
index 1fdd55926d6177e106dc2debbaee4b5e7626a748..1d347f3d5f6c09db64009bac79f5b3148f6edcae 100644 (file)
--- a/src/Model/Photo.php
+++ b/src/Model/Photo.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -21,17 +21,17 @@
 
 namespace Friendica\Model;
 
-use Friendica\Core\Cache\Duration;
+use Friendica\Core\Cache\Enum\Duration;
 use Friendica\Core\Logger;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Database\DBStructure;
 use Friendica\DI;
-use Friendica\Model\Storage\ExternalResource;
-use Friendica\Model\Storage\InvalidClassStorageException;
-use Friendica\Model\Storage\ReferenceStorageException;
-use Friendica\Model\Storage\StorageException;
-use Friendica\Model\Storage\SystemResource;
+use Friendica\Core\Storage\Type\ExternalResource;
+use Friendica\Core\Storage\Exception\InvalidClassStorageException;
+use Friendica\Core\Storage\Exception\ReferenceStorageException;
+use Friendica\Core\Storage\Exception\StorageException;
+use Friendica\Core\Storage\Type\SystemResource;
 use Friendica\Object\Image;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Images;
@@ -45,6 +45,7 @@ use Friendica\Util\Strings;
 class Photo
 {
        const CONTACT_PHOTOS = 'Contact Photos';
+       const PROFILE_PHOTOS = 'Profile Photos';
 
        const DEFAULT        = 0;
        const USER_AVATAR    = 10;
@@ -379,7 +380,7 @@ class Photo
                        "data" => $data,
                        "scale" => $scale,
                        "photo-type" => $type,
-                       "profile" => $type == self::USER_AVATAR,
+                       "profile" => false,
                        "allow_cid" => $allow_cid,
                        "allow_gid" => $allow_gid,
                        "deny_cid" => $deny_cid,
@@ -563,25 +564,6 @@ class Photo
                        $image_url = DI::baseUrl() . "/photo/" . $resource_id . "-4." . $Image->getExt() . $suffix;
                        $thumb = DI::baseUrl() . "/photo/" . $resource_id . "-5." . $Image->getExt() . $suffix;
                        $micro = DI::baseUrl() . "/photo/" . $resource_id . "-6." . $Image->getExt() . $suffix;
-
-                       // Remove the cached photo
-                       $a = DI::app();
-                       $basepath = $a->getBasePath();
-
-                       if (is_dir($basepath . "/photo")) {
-                               $filename = $basepath . "/photo/" . $resource_id . "-4." . $Image->getExt();
-                               if (file_exists($filename)) {
-                                       unlink($filename);
-                               }
-                               $filename = $basepath . "/photo/" . $resource_id . "-5." . $Image->getExt();
-                               if (file_exists($filename)) {
-                                       unlink($filename);
-                               }
-                               $filename = $basepath . "/photo/" . $resource_id . "-6." . $Image->getExt();
-                               if (file_exists($filename)) {
-                                       unlink($filename);
-                               }
-                       }
                } else {
                        $photo_failure = true;
                }
@@ -650,6 +632,8 @@ class Photo
        {
                $sql_extra = Security::getPermissionsSQLByUserId($uid);
 
+               $avatar_type = (local_user() && (local_user() == $uid)) ? Photo::USER_AVATAR : Photo::DEFAULT;
+
                $key = "photo_albums:".$uid.":".local_user().":".remote_user();
                $albums = DI::cache()->get($key);
                if (is_null($albums) || $update) {
@@ -658,20 +642,20 @@ class Photo
                                // At this time we just store the data in the cache
                                $albums = DBA::toArray(DBA::p("SELECT COUNT(DISTINCT `resource-id`) AS `total`, `album`, ANY_VALUE(`created`) AS `created`
                                        FROM `photo`
-                                       WHERE `uid` = ? AND NOT `photo-type` IN (?, ?) $sql_extra
+                                       WHERE `uid` = ? AND `photo-type` IN (?, ?) $sql_extra
                                        GROUP BY `album` ORDER BY `created` DESC",
                                        $uid,
-                                       self::CONTACT_AVATAR,
-                                       self::CONTACT_BANNER
+                                       self::DEFAULT,
+                                       $avatar_type
                                ));
                        } else {
                                // This query doesn't do the count and is much faster
                                $albums = DBA::toArray(DBA::p("SELECT DISTINCT(`album`), '' AS `total`
                                        FROM `photo` USE INDEX (`uid_album_scale_created`)
-                                       WHERE `uid` = ? AND NOT `photo-type` IN (?, ?) $sql_extra",
+                                       WHERE `uid` = ? AND `photo-type` IN (?, ?) $sql_extra",
                                        $uid,
-                                       self::CONTACT_AVATAR,
-                                       self::CONTACT_BANNER
+                                       self::DEFAULT,
+                                       $avatar_type
                                ));
                        }
                        DI::cache()->set($key, $albums, Duration::DAY);
@@ -967,9 +951,6 @@ class Photo
                @unlink($src);
 
                $max_length = DI::config()->get('system', 'max_image_length');
-               if (!$max_length) {
-                       $max_length = MAX_IMAGE_LENGTH;
-               }
                if ($max_length > 0) {
                        $Image->scaleDown($max_length);
                        $filesize = strlen($Image->asString());