Add storage backend manager class

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

diff --git a/src/Model/Photo.php b/src/Model/Photo.php
index a72a7a66f9b890196fad4777fdefa3b9a6a2e005..4942381a4c15fbd2a434750d0d2dbd27d4e6dd17 100644 (file)
--- a/src/Model/Photo.php
+++ b/src/Model/Photo.php
@@ -11,6 +11,7 @@ use Friendica\Core\Cache;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
+use Friendica\Core\StorageManager;
 use Friendica\Database\DBA;
 use Friendica\Database\DBStructure;
 use Friendica\Object\Image;
@@ -67,7 +68,7 @@ class Photo extends BaseObject
        }
 
        /**
-        * @brief Get a photo for user id
+        * @brief Get photos for user id
         *
         * @param integer  $uid          User id
         * @param string   $resourceid   Rescource ID of the photo
@@ -221,19 +222,19 @@ class Photo extends BaseObject
        /**
         * @brief store photo metadata in db and binary in default backend
         *
-        * @param Image   $Image     image
-        * @param integer $uid       uid
-        * @param integer $cid       cid
-        * @param integer $rid       rid
-        * @param string  $filename  filename
-        * @param string  $album     album name
-        * @param integer $scale     scale
-        * @param integer $profile   optional, default = 0
-        * @param string  $allow_cid optional, default = ""
-        * @param string  $allow_gid optional, default = ""
-        * @param string  $deny_cid  optional, default = ""
-        * @param string  $deny_gid  optional, default = ""
-        * @param string  $desc      optional, default = ""
+        * @param Image   $Image     Image object with data
+        * @param integer $uid       User ID
+        * @param integer $cid       Contact ID
+        * @param integer $rid       Resource ID
+        * @param string  $filename  Filename
+        * @param string  $album     Album name
+        * @param integer $scale     Scale
+        * @param integer $profile   Is a profile image? optional, default = 0
+        * @param string  $allow_cid Permissions, allowed contacts. optional, default = ""
+        * @param string  $allow_gid Permissions, allowed groups. optional, default = ""
+        * @param string  $deny_cid  Permissions, denied contacts.optional, default = ""
+        * @param string  $deny_gid  Permissions, denied greoup.optional, default = ""
+        * @param string  $desc      Photo caption. optional, default = ""
         *
         * @return boolean True on success
         */
@@ -246,7 +247,11 @@ class Photo extends BaseObject
                        $guid = System::createGUID();
                }
 
-               $existing_photo = self::selectFirst(["id", "backend-class", "backend-ref"], ["resource-id" => $rid, "uid" => $uid, "contact-id" => $cid, "scale" => $scale]);
+               $existing_photo = self::selectFirst(["id", "created", "backend-class", "backend-ref"], ["resource-id" => $rid, "uid" => $uid, "contact-id" => $cid, "scale" => $scale]);
+               $created = DateTimeFormat::utcNow();
+               if (DBA::isResult($existing_photo)) {
+                       $created = $existing_photo["created"];
+               }
 
                // Get defined storage backend.
                // if no storage backend, we use old "data" column in photo table.
@@ -259,7 +264,7 @@ class Photo extends BaseObject
                        $backend_ref = (string)$existing_photo["backend-ref"];
                        $backend_class = (string)$existing_photo["backend-class"];
                } else {
-                       $backend_class = Config::get("storage", "class", "");
+                       $backend_class = StorageManager::getBackend();
                }
                if ($backend_class === "") {
                        $data = $Image->asString();
@@ -273,7 +278,7 @@ class Photo extends BaseObject
                        "contact-id" => $cid,
                        "guid" => $guid,
                        "resource-id" => $rid,
-                       "created" => DateTimeFormat::utcNow(),
+                       "created" => $created,
                        "edited" => DateTimeFormat::utcNow(),
                        "filename" => basename($filename),
                        "type" => $Image->getType(),
@@ -345,6 +350,8 @@ class Photo extends BaseObject
                        }
                }
 
+               $fields['updated'] = DateTimeFormat::utcNow();
+
                return DBA::update("photo", $fields, $conditions);
        }
 
@@ -541,6 +548,6 @@ class Photo extends BaseObject
         */
        public static function newResource()
        {
-               return system::createGUID(32, false);
+               return System::createGUID(32, false);
        }
 }