X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FPhoto.php;h=4ec4f204c3c4efee2973ca7f94454fbe479ba9a9;hb=3940e804e3ee4ac921e109f62a73fac2becaa611;hp=0fddb8276a0e2df72d5b07cda646c295e09f9acc;hpb=b96dbcd4cb93749d64b4c31f5fb1eec153114e69;p=friendica.git

diff --git a/src/Module/Photo.php b/src/Module/Photo.php
index 0fddb8276a..4ec4f204c3 100644
--- a/src/Module/Photo.php
+++ b/src/Module/Photo.php
@@ -6,20 +6,17 @@
 namespace Friendica\Module;
 
 use Friendica\BaseModule;
+use Friendica\Core\L10n;
 use Friendica\Core\Logger;
+use Friendica\Core\System;
 use Friendica\Model\Photo as MPhoto;
 use Friendica\Object\Image;
-use Friendica\Util\Security;
-use Friendica\Network\HTTPException\NotFoundException;
-use Friendica\Network\HTTPException\BadRequestException;
-use Friendica\Network\HTTPException\InternalServerErrorException;
 
 /**
  * @brief Photo Module
  */
 class Photo extends BaseModule
 {
-
 	/**
 	 * @brief Module initializer
 	 *
@@ -29,73 +26,75 @@ class Photo extends BaseModule
 	public static function init()
 	{
 		$a = self::getApp();
+		// @TODO: Replace with parameter from router
 		if ($a->argc <= 1 || $a->argc > 4) {
-			throw new BadRequestException();
-			killme();
+			throw new \Friendica\Network\HTTPException\BadRequestException();
 		}
 
-		if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE'])) {
-			header('HTTP/1.1 304 Not Modified');
+		if (isset($_SERVER["HTTP_IF_MODIFIED_SINCE"])) {
+			header("HTTP/1.1 304 Not Modified");
 			header("Last-Modified: " . gmdate("D, d M Y H:i:s", time()) . " GMT");
-			if (!empty($_SERVER['HTTP_IF_NONE_MATCH'])) {
-				header('Etag: ' . $_SERVER['HTTP_IF_NONE_MATCH']);
+			if (!empty($_SERVER["HTTP_IF_NONE_MATCH"])) {
+				header("Etag: " . $_SERVER["HTTP_IF_NONE_MATCH"]);
 			}
 			header("Expires: " . gmdate("D, d M Y H:i:s", time() + (31536000)) . " GMT");
 			header("Cache-Control: max-age=31536000");
-			if (function_exists('header_remove')) {
-				header_remove('Last-Modified');
-				header_remove('Expires');
-				header_remove('Cache-Control');
+			if (function_exists("header_remove")) {
+				header_remove("Last-Modified");
+				header_remove("Expires");
+				header_remove("Cache-Control");
 			}
 			exit;
 		}
 
 		$customsize = 0;
+		$photo = false;
+		// @TODO: Replace with parameter from router
 		switch($a->argc) {
-		case 4:
-			$customsize = intval($a->argv[2]);
-			$uid = self::stripExtension($a->argv[3]);
-			$photo = self::getAvatar($uid, $a->argv[1]);
-			break;
-		case 3:
-			$uid = self::stripExtension($a->argv[2]);
-			$photo = self::getAvatar($uid, $a->argv[1]);
-			break;
-		case 2:
-			$photoid = self::stripExtension($a->argv[1]);
-			$scale = 0;
-			if (substr($photoid, -2, 1) == '-') {
-				$scale = intval(substr($photoid, -1, 1));
-				$photoid = substr($photoid, 0, -2);
-			}
-			$photo = MPhoto::getPhoto($photoid, $scale);
-			break;
+			case 4:
+				$customsize = intval($a->argv[2]);
+				$uid = MPhoto::stripExtension($a->argv[3]);
+				$photo = self::getAvatar($uid, $a->argv[1]);
+				break;
+			case 3:
+				$uid = MPhoto::stripExtension($a->argv[2]);
+				$photo = self::getAvatar($uid, $a->argv[1]);
+				break;
+			case 2:
+				$photoid = MPhoto::stripExtension($a->argv[1]);
+				$scale = 0;
+				if (substr($photoid, -2, 1) == "-") {
+					$scale = intval(substr($photoid, -1, 1));
+					$photoid = substr($photoid, 0, -2);
+				}
+				$photo = MPhoto::getPhoto($photoid, $scale);
+				if ($photo === false) {
+					$photo = MPhoto::createPhotoForSystemResource("images/nosign.jpg");
+				}
+				break;
 		}
 
-		if ($photo===false) {
-			header($_SERVER["SERVER_PROTOCOL"] . " 404 Not Found" , true, 404);
-			killme();
+		if ($photo === false) {
+			System::httpExit('404', 'Not Found');
 		}
 
-		$cacheable = ($photo["allow_cid"].$photo["allow_gid"].$photo["deny_cid"].$photo["deny_gid"] === "") || defaults($photo, "cacheable", false);
+		$cacheable = ($photo["allow_cid"] . $photo["allow_gid"] . $photo["deny_cid"] . $photo["deny_gid"] === "") && (isset($photo["cacheable"]) ? $photo["cacheable"] : true);
 
-		$img = MPhoto::getImageForPhotoId($photo["id"]);
+		$img = MPhoto::getImageForPhoto($photo);
 
 		if (is_null($img) || !$img->isValid()) {
-			Logger::log("Invalid photo with id {$photo['id']}.");
-			throw new InternalServerErrorException();
+			Logger::log("Invalid photo with id {$photo["id"]}.");
+			throw new \Friendica\Network\HTTPException\InternalServerErrorException(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) {
 			$img->scaleToSquare($customsize);
 		}
 
-
-		if (function_exists('header_remove')) {
-			header_remove('Pragma');
-			header_remove('pragma');
+		if (function_exists("header_remove")) {
+			header_remove("Pragma");
+			header_remove("pragma");
 		}
 
 		header("Content-type: " . $img->getType());
@@ -106,27 +105,16 @@ class Photo extends BaseModule
 			// and subsequently have permission to see it
 			header("Cache-Control: no-store, no-cache, must-revalidate");
 		} else {
+			$md5 = md5($img->asString());
 			header("Last-Modified: " . gmdate("D, d M Y H:i:s", time()) . " GMT");
-			header('Etag: "' . md5($img->asString()) . '"');
+			header("Etag: \"{$md5}\"");
 			header("Expires: " . gmdate("D, d M Y H:i:s", time() + (31536000)) . " GMT");
 			header("Cache-Control: max-age=31536000");
 		}
 
-
-
 		echo $img->asString();
 
-
-		killme();
-	}
-
-	private static function stripExtension($name)
-	{
-		$name = str_replace([".jpg", ".png", ".gif"], ["", "", ""], $name);
-		foreach (Image::supportedTypes() AS $m => $e) {
-			$name = str_replace('.' . $e, '', $name);
-		}
-		return $name;
+		exit();
 	}
 
 	private static function getAvatar($uid, $type="avatar")
@@ -149,10 +137,10 @@ class Photo extends BaseModule
 		}
 
 		$photo = MPhoto::selectFirst([], ["scale" => $scale, "uid" => $uid, "profile" => 1]);
-		if ($photo===false) {
-			// todo default image info
+		if ($photo === false) {
+			$photo = MPhoto::createPhotoForSystemResource($default);
 		}
 		return $photo;
 	}
 
-}
\ No newline at end of file
+}