X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FUser.php;h=71e2c8a81200d2942ad64f62dd642a4146688e6f;hb=8dc0ab9bb3379fec0be442160db1ae29ef8cea9d;hp=d99588e05bb74246e779805291debec4c28b0140;hpb=bb349a7db445db516f2cd87344800de11af99992;p=friendica.git

diff --git a/src/Model/User.php b/src/Model/User.php
index d99588e05b..71e2c8a812 100644
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -30,10 +30,12 @@ use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
+use Friendica\Core\Search;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\DI;
+use Friendica\Network\HTTPClient\Client\HttpClientAccept;
 use Friendica\Security\TwoFactor\Model\AppSpecificPassword;
 use Friendica\Network\HTTPException;
 use Friendica\Object\Image;
@@ -850,19 +852,16 @@ class User
 				break;
 		}
 
-		$updated =  '';
-		$imagetype = IMAGETYPE_JPEG;
+		$updated  =  '';
+		$mimetype = '';
 
 		$photo = Photo::selectFirst(['type', 'created', 'edited', 'updated'], ["scale" => $scale, 'uid' => $user['uid'], 'profile' => true]);
 		if (!empty($photo)) {
-			$updated = max($photo['created'], $photo['edited'], $photo['updated']);
-
-			if (in_array($photo['type'], ['image/png', 'image/gif'])) {
-				$imagetype = IMAGETYPE_PNG;
-			}
+			$updated  = max($photo['created'], $photo['edited'], $photo['updated']);
+			$mimetype = $photo['type'];
 		}
 
-		return $url . $user['nickname'] . image_type_to_extension($imagetype) . ($updated ? '?ts=' . strtotime($updated) : '');
+		return $url . $user['nickname'] . Images::getExtensionByMimeType($mimetype) . ($updated ? '?ts=' . strtotime($updated) : '');
 	}
 
 	/**
@@ -880,22 +879,19 @@ class User
 
 		$url = DI::baseUrl() . '/photo/banner/';
 
-		$updated =  '';
-		$imagetype = IMAGETYPE_JPEG;
+		$updated  = '';
+		$mimetype = '';
 
 		$photo = Photo::selectFirst(['type', 'created', 'edited', 'updated'], ["scale" => 3, 'uid' => $user['uid'], 'photo-type' => Photo::USER_BANNER]);
 		if (!empty($photo)) {
-			$updated = max($photo['created'], $photo['edited'], $photo['updated']);
-
-			if (in_array($photo['type'], ['image/png', 'image/gif'])) {
-				$imagetype = IMAGETYPE_PNG;
-			}
+			$updated  = max($photo['created'], $photo['edited'], $photo['updated']);
+			$mimetype = $photo['type'];
 		} else {
 			// Only for the RC phase: Don't return an image link for the default picture
 			return '';
 		}
 
-		return $url . $user['nickname'] . image_type_to_extension($imagetype) . ($updated ? '?ts=' . strtotime($updated) : '');
+		return $url . $user['nickname'] . Images::getExtensionByMimeType($mimetype) . ($updated ? '?ts=' . strtotime($updated) : '');
 	}
 
 	/**
@@ -1156,8 +1152,9 @@ class User
 			$photo_failure = false;
 
 			$filename = basename($photo);
-			$curlResult = DI::httpClient()->get($photo);
+			$curlResult = DI::httpClient()->get($photo, HttpClientAccept::IMAGE);
 			if ($curlResult->isSuccess()) {
+				Logger::debug('Got picture', ['Content-Type' => $curlResult->getHeader('Content-Type'), 'url' => $photo]);
 				$img_str = $curlResult->getBody();
 				$type = $curlResult->getContentType();
 			} else {
@@ -1291,7 +1288,7 @@ class User
 
 		$profile = DBA::selectFirst('profile', ['net-publish'], ['uid' => $register['uid']]);
 
-		if (DBA::isResult($profile) && $profile['net-publish'] && DI::config()->get('system', 'directory')) {
+		if (DBA::isResult($profile) && $profile['net-publish'] && Search::getGlobalDirectory()) {
 			$url = DI::baseUrl() . '/profile/' . $user['nickname'];
 			Worker::add(PRIORITY_LOW, "Directory", $url);
 		}