Refactor datetime_convert into Temporal::convert

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

diff --git a/src/Model/Photo.php b/src/Model/Photo.php
index ef59eee7e9aa932ce09808c40273521d2f992e37..a2c69f994c0f8444d96e9d505711d083c36bc9dd 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\Network;
+use Friendica\Util\Temporal;
 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' => Temporal::convert(),
+                       'edited' => Temporal::convert(),
                        '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;
@@ -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);