X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FPhoto.php;h=c622421cc039e74d0bd298284a26cf8471fd65f2;hb=e409001dfbbe0582e922e9702426383bc2b643be;hp=62b6088d974bcbc6c8240b075f8815a26f26332b;hpb=91198cb53d19999079806438d818c6a20554f4e1;p=friendica.git

diff --git a/src/Model/Photo.php b/src/Model/Photo.php
index 62b6088d97..c622421cc0 100644
--- 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,
@@ -88,19 +91,22 @@ 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;
 
 		$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 +177,7 @@ class Photo
 			$micro = System::baseUrl() . '/images/person-48.jpg';
 		}
 
-		return array($image_url, $thumb, $micro);
+		return [$image_url, $thumb, $micro];
 	}
 
 	/**
@@ -184,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)));
 	}
 
@@ -197,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]);
 	}
 
@@ -235,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
@@ -244,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);
@@ -261,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);
+	}
 }