Merge pull request #4327 from MrPetovan/task/3878-move-datetime-to-src

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

diff --git a/src/Model/Photo.php b/src/Model/Photo.php
index 62b6088d974bcbc6c8240b075f8815a26f26332b..cf31849c8d23c1e2a7971c4cd3d2ffc9104a724c 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';
@@ -52,8 +55,8 @@ class Photo
                        '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,
@@ -100,7 +103,7 @@ class Photo
                $photo_failure = false;
 
                $filename = basename($image_url);
-               $img_str = fetch_url($image_url, true);
+               $img_str = Network::fetchUrl($image_url, true);
 
                if ($quit_on_error && ($img_str == "")) {
                        return false;
@@ -171,7 +174,7 @@ class Photo
                        $micro = System::baseUrl() . '/images/person-48.jpg';
                }
 
-               return array($image_url, $thumb, $micro);
+               return [$image_url, $thumb, $micro];
        }
 
        /**
@@ -184,9 +187,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)));
        }
 
@@ -197,15 +200,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]);
        }
 
@@ -235,7 +238,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
@@ -244,7 +247,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);