X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FPhoto.php;h=64d9e3542ae0f29836745dd0e9c389646a167892;hb=9a4128a5c8af7c9791d9196266cbec43c11adb16;hp=2cb29af5f6b348c45f730fbf8927cf2a78373828;hpb=85dc9bb96b30819fcf544c9aa1013a8f380d6981;p=friendica.git

diff --git a/src/Module/Photo.php b/src/Module/Photo.php
index 2cb29af5f6..64d9e3542a 100644
--- a/src/Module/Photo.php
+++ b/src/Module/Photo.php
@@ -23,9 +23,12 @@ namespace Friendica\Module;
 
 use Friendica\BaseModule;
 use Friendica\Core\Logger;
-use Friendica\Core\System;
+use Friendica\Database\DBA;
 use Friendica\DI;
+use Friendica\Model\Contact;
 use Friendica\Model\Photo as MPhoto;
+use Friendica\Util\Proxy;
+use Friendica\Object\Image;
 
 /**
  * Photo Module
@@ -38,8 +41,9 @@ class Photo extends BaseModule
 	 * Fetch a photo or an avatar, in optional size, check for permissions and
 	 * return the image
 	 */
-	public static function init(array $parameters = [])
+	public static function rawContent(array $parameters = [])
 	{
+		$totalstamp = microtime(true);
 		$a = DI::app();
 		// @TODO: Replace with parameter from router
 		if ($a->argc <= 1 || $a->argc > 4) {
@@ -64,7 +68,9 @@ class Photo extends BaseModule
 
 		$customsize = 0;
 		$photo = false;
+		$scale = null;
 		// @TODO: Replace with parameter from router
+		$stamp = microtime(true);
 		switch($a->argc) {
 			case 4:
 				$customsize = intval($a->argv[2]);
@@ -84,27 +90,32 @@ class Photo extends BaseModule
 				}
 				$photo = MPhoto::getPhoto($photoid, $scale);
 				if ($photo === false) {
-					$photo = MPhoto::createPhotoForSystemResource("images/nosign.jpg");
+					throw new \Friendica\Network\HTTPException\NotFoundException(DI::l10n()->t('The Photo with id %s is not available.', $photoid));
 				}
 				break;
 		}
+		$fetch = microtime(true) - $stamp;
 
 		if ($photo === false) {
-			System::httpExit('404', 'Not Found');
+			throw new \Friendica\Network\HTTPException\NotFoundException();
 		}
 
 		$cacheable = ($photo["allow_cid"] . $photo["allow_gid"] . $photo["deny_cid"] . $photo["deny_gid"] === "") && (isset($photo["cacheable"]) ? $photo["cacheable"] : true);
 
-		$img = MPhoto::getImageForPhoto($photo);
+		$stamp = microtime(true);
+		$imgdata = MPhoto::getImageDataForPhoto($photo);
+		$data = microtime(true) - $stamp;
 
-		if (is_null($img) || !$img->isValid()) {
-			Logger::log("Invalid photo with id {$photo["id"]}.");
+		if (empty($imgdata)) {
+			Logger::warning("Invalid photo with id {$photo["id"]}.");
 			throw new \Friendica\Network\HTTPException\InternalServerErrorException(DI::l10n()->t('Invalid photo with id %s.', $photo["id"]));
 		}
 
 		// if customsize is set and image is not a gif, resize it
-		if ($img->getType() !== "image/gif" && $customsize > 0 && $customsize < 501) {
+		if ($photo['type'] !== "image/gif" && $customsize > 0 && $customsize < 501) {
+			$img = new Image($imgdata, $photo['type']);
 			$img->scaleToSquare($customsize);
+			$imgdata = $img->asString();
 		}
 
 		if (function_exists("header_remove")) {
@@ -112,50 +123,74 @@ class Photo extends BaseModule
 			header_remove("pragma");
 		}
 
-		header("Content-type: " . $img->getType());
+		header("Content-type: " . $photo['type']);
 
+		$stamp = microtime(true);
 		if (!$cacheable) {
 			// it is a private photo that they have no permission to view.
 			// tell the browser not to cache it, in case they authenticate
 			// and subsequently have permission to see it
 			header("Cache-Control: no-store, no-cache, must-revalidate");
 		} else {
-			$md5 = md5($img->asString());
+			$md5 = $photo['hash'] ?: md5($imgdata);
 			header("Last-Modified: " . gmdate("D, d M Y H:i:s", time()) . " GMT");
 			header("Etag: \"{$md5}\"");
 			header("Expires: " . gmdate("D, d M Y H:i:s", time() + (31536000)) . " GMT");
 			header("Cache-Control: max-age=31536000");
 		}
+		$checksum = microtime(true) - $stamp;
 
-		echo $img->asString();
+		$stamp = microtime(true);
+		echo $imgdata;
+		$output = microtime(true) - $stamp;
+
+		$total = microtime(true) - $totalstamp;
+		$rest = $total - ($fetch + $data + $checksum + $output);
+
+		if (!is_null($scale) && ($scale < 4)) {
+			Logger::info('Performance:', ['scale' => $scale, 'resource' => $photo['resource-id'],
+				'total' => number_format($total, 3), 'fetch' => number_format($fetch, 3),
+				'data' => number_format($data, 3), 'checksum' => number_format($checksum, 3),
+				'output' => number_format($output, 3), 'rest' => number_format($rest, 3)]);
+		}
 
 		exit();
 	}
 
 	private static function getAvatar($uid, $type="avatar")
 	{
-
 		switch($type) {
-		case "profile":
-		case "custom":
-			$scale = 4;
-			$default = "images/person-300.jpg";
-			break;
-		case "micro":
-			$scale = 6;
-			$default = "images/person-48.jpg";
-			break;
-		case "avatar":
-		default:
-			$scale = 5;
-			$default = "images/person-80.jpg";
+			case "profile":
+			case "custom":
+				$scale = 4;
+				break;
+			case "micro":
+				$scale = 6;
+				break;
+			case "avatar":
+			default:
+				$scale = 5;
 		}
 
 		$photo = MPhoto::selectFirst([], ["scale" => $scale, "uid" => $uid, "profile" => 1]);
-		if ($photo === false) {
+		if (empty($photo)) {
+			$contact = DBA::selectFirst('contact', [], ['uid' => $uid, 'self' => true]) ?: [];
+
+			switch($type) {
+				case "profile":
+				case "custom":
+					$default = Contact::getDefaultAvatar($contact, Proxy::SIZE_SMALL);
+					break;
+				case "micro":
+					$default = Contact::getDefaultAvatar($contact, Proxy::SIZE_MICRO);
+					break;
+				case "avatar":
+				default:
+					$default = Contact::getDefaultAvatar($contact, Proxy::SIZE_THUMB);
+			}
+	
 			$photo = MPhoto::createPhotoForSystemResource($default);
 		}
 		return $photo;
 	}
-
 }