Merge pull request #5351 from nupplaphil/system_guid

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

diff --git a/src/Model/Photo.php b/src/Model/Photo.php
index a2c69f994c0f8444d96e9d505711d083c36bc9dd..b08c6f0459b8654fe0fdfa220255e24107674376 100644 (file)
--- a/src/Model/Photo.php
+++ b/src/Model/Photo.php
@@ -12,8 +12,8 @@ use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
 use Friendica\Object\Image;
+use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
-use Friendica\Util\Temporal;
 use dba;
 
 require_once 'include/dba.php';
@@ -45,7 +45,7 @@ class Photo
                if (DBM::is_result($photo)) {
                        $guid = $photo['guid'];
                } else {
-                       $guid = get_guid();
+                       $guid = System::createGUID();
                }
 
                $existing_photo = dba::selectFirst('photo', ['id'], ['resource-id' => $rid, 'uid' => $uid, 'contact-id' => $cid, 'scale' => $scale]);
@@ -55,8 +55,8 @@ class Photo
                        'contact-id' => $cid,
                        'guid' => $guid,
                        'resource-id' => $rid,
-                       'created' => Temporal::convert(),
-                       'edited' => Temporal::convert(),
+                       'created' => DateTimeFormat::utcNow(),
+                       'edited' => DateTimeFormat::utcNow(),
                        'filename' => basename($filename),
                        'type' => $Image->getType(),
                        'album' => $album,
@@ -91,13 +91,16 @@ class Photo
         */
        public static function importProfilePhoto($image_url, $uid, $cid, $quit_on_error = false)
        {
+               $thumb = '';
+               $micro = '';
+
                $photo = dba::selectFirst(
                        'photo', ['resource-id'], ['uid' => $uid, 'contact-id' => $cid, 'scale' => 4, 'album' => 'Contact Photos']
                );
                if (x($photo['resource-id'])) {
                        $hash = $photo['resource-id'];
                } else {
-                       $hash = photo_new_resource();
+                       $hash = self::newResource();
                }
 
                $photo_failure = false;
@@ -264,4 +267,14 @@ class Photo
                $key = "photo_albums:".$uid.":".local_user().":".remote_user();
                Cache::set($key, null, CACHE_DAY);
        }
+
+       /**
+        * Generate a unique photo ID.
+        *
+        * @return string
+        */
+       public static function newResource()
+       {
+               return system::createGUID(32, false);
+       }
 }