Merge pull request #4480 from annando/better-resource-id

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

diff --git a/src/Model/Photo.php b/src/Model/Photo.php
index a25b2fa9d669e9fbddd451cd559c0e687d87c755..c622421cc039e74d0bd298284a26cf8471fd65f2 100644 (file)
--- a/src/Model/Photo.php
+++ b/src/Model/Photo.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @file src/Model/Photo.php
  * @brief This file contains the Photo class for database interface
@@ -7,10 +8,12 @@ namespace Friendica\Model;
 
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
-use Friendica\Core\PConfig;
+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 dba;
 
 require_once 'include/dba.php';
@@ -38,22 +41,22 @@ class Photo
         */
        public static function store(Image $Image, $uid, $cid, $rid, $filename, $album, $scale, $profile = 0, $allow_cid = '', $allow_gid = '', $deny_cid = '', $deny_gid = '', $desc = '')
        {
-               $r = dba::select('photo', array('guid'), array("`resource-id` = ? AND `guid` != ?", $rid, ''), array('limit' => 1));
-               if (DBM::is_result($r)) {
-                       $guid = $r['guid'];
+               $photo = dba::selectFirst('photo', ['guid'], ["`resource-id` = ? AND `guid` != ?", $rid, '']);
+               if (DBM::is_result($photo)) {
+                       $guid = $photo['guid'];
                } else {
                        $guid = get_guid();
                }
 
-               $x = dba::select('photo', array('id'), array('resource-id' => $rid, 'uid' => $uid, 'contact-id' => $cid, 'scale' => $scale), array('limit' => 1));
+               $existing_photo = dba::selectFirst('photo', ['id'], ['resource-id' => $rid, 'uid' => $uid, 'contact-id' => $cid, 'scale' => $scale]);
 
-               $fields = array(
+               $fields = [
                        'uid' => $uid,
                        'contact-id' => $cid,
                        'guid' => $guid,
                        'resource-id' => $rid,
-                       'created' => datetime_convert(),
-                       'edited' => datetime_convert(),
+                       'created' => DateTimeFormat::utcNow(),
+                       'edited' => DateTimeFormat::utcNow(),
                        'filename' => basename($filename),
                        'type' => $Image->getType(),
                        'album' => $album,
@@ -68,10 +71,10 @@ class Photo
                        'deny_cid' => $deny_cid,
                        'deny_gid' => $deny_gid,
                        'desc' => $desc
-               );
+               ];
 
-               if (DBM::is_result($x)) {
-                       $r = dba::update('photo', $fields, array('id' => $x['id']));
+               if (DBM::is_result($existing_photo)) {
+                       $r = dba::update('photo', $fields, ['id' => $existing_photo['id']]);
                } else {
                        $r = dba::insert('photo', $fields);
                }
@@ -80,34 +83,36 @@ class Photo
        }
 
        /**
-        * @param string  $photo         photo
+        * @param string  $image_url     Remote URL
         * @param integer $uid           user id
         * @param integer $cid           contact id
         * @param boolean $quit_on_error optional, default false
         * @return array
         */
-       public static function importProfilePhoto($photo, $uid, $cid, $quit_on_error = false)
+       public static function importProfilePhoto($image_url, $uid, $cid, $quit_on_error = false)
        {
-               $r = dba::select(
-                       'photo', array('resource-id'), array('uid' => $uid, 'contact-id' => $cid, 'scale' => 4, 'album' => 'Contact Photos'), array('limit' => 1)
-               );
+               $thumb = '';
+               $micro = '';
 
-               if (DBM::is_result($r) && strlen($r['resource-id'])) {
-                       $hash = $r['resource-id'];
+               $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;
 
-               $filename = basename($photo);
-               $img_str = fetch_url($photo, true);
+               $filename = basename($image_url);
+               $img_str = Network::fetchUrl($image_url, true);
 
                if ($quit_on_error && ($img_str == "")) {
                        return false;
                }
 
-               $type = Image::guessType($photo, true);
+               $type = Image::guessType($image_url, true);
                $Image = new Image($img_str, $type);
                if ($Image->isValid()) {
                        $Image->scaleToSquare(175);
@@ -136,7 +141,7 @@ class Photo
 
                        $suffix = '?ts=' . time();
 
-                       $photo = System::baseUrl() . '/photo/' . $hash . '-4.' . $Image->getExt() . $suffix;
+                       $image_url = System::baseUrl() . '/photo/' . $hash . '-4.' . $Image->getExt() . $suffix;
                        $thumb = System::baseUrl() . '/photo/' . $hash . '-5.' . $Image->getExt() . $suffix;
                        $micro = System::baseUrl() . '/photo/' . $hash . '-6.' . $Image->getExt() . $suffix;
 
@@ -167,12 +172,12 @@ class Photo
                }
 
                if ($photo_failure) {
-                       $photo = System::baseUrl() . '/images/person-175.jpg';
+                       $image_url = System::baseUrl() . '/images/person-175.jpg';
                        $thumb = System::baseUrl() . '/images/person-80.jpg';
                        $micro = System::baseUrl() . '/images/person-48.jpg';
                }
 
-               return array($photo, $thumb, $micro);
+               return [$image_url, $thumb, $micro];
        }
 
        /**
@@ -185,9 +190,9 @@ class Photo
                $degrees = count($exifCoord) > 0 ? self::gps2Num($exifCoord[0]) : 0;
                $minutes = count($exifCoord) > 1 ? self::gps2Num($exifCoord[1]) : 0;
                $seconds = count($exifCoord) > 2 ? self::gps2Num($exifCoord[2]) : 0;
-       
+
                $flip = ($hemi == 'W' || $hemi == 'S') ? -1 : 1;
-       
+
                return floatval($flip * ($degrees + ($minutes / 60) + ($seconds / 3600)));
        }
 
@@ -198,15 +203,15 @@ class Photo
        private static function gps2Num($coordPart)
        {
                $parts = explode('/', $coordPart);
-       
+
                if (count($parts) <= 0) {
                        return 0;
                }
-       
+
                if (count($parts) == 1) {
                        return $parts[0];
                }
-       
+
                return floatval($parts[0]) / floatval($parts[1]);
        }
 
@@ -236,7 +241,7 @@ class Photo
                                        GROUP BY `album` ORDER BY `created` DESC",
                                        intval($uid),
                                        dbesc('Contact Photos'),
-                                       dbesc(t('Contact Photos'))
+                                       dbesc(L10n::t('Contact Photos'))
                                );
                        } else {
                                // This query doesn't do the count and is much faster
@@ -245,7 +250,7 @@ class Photo
                                        WHERE `uid` = %d  AND `album` != '%s' AND `album` != '%s' $sql_extra",
                                        intval($uid),
                                        dbesc('Contact Photos'),
-                                       dbesc(t('Contact Photos'))
+                                       dbesc(L10n::t('Contact Photos'))
                                );
                        }
                        Cache::set($key, $albums, CACHE_DAY);
@@ -262,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 get_guid(32, false);
+       }
 }