X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fphoto.php;h=fab34a62f03b395f33749d12e5cbb7b0e2634319;hb=14dff6b0e0c5ff43df8b2cd8da440bdeaf2b3384;hp=bd49437e26687a69147b874119a3e96956886728;hpb=f17377e6ded9540d31c57166aedd2d177b519331;p=friendica.git

diff --git a/mod/photo.php b/mod/photo.php
index bd49437e26..fab34a62f0 100644
--- a/mod/photo.php
+++ b/mod/photo.php
@@ -7,6 +7,7 @@ function photo_init(&$a) {
 	global $_SERVER;
 
 	$prvcachecontrol = false;
+	$file = "";
 
 	switch($a->argc) {
 		case 4:
@@ -20,6 +21,7 @@ function photo_init(&$a) {
 			break;
 		case 2:
 			$photo = $a->argv[1];
+			$file = $photo;
 			break;
 		case 1:
 		default:
@@ -42,7 +44,6 @@ function photo_init(&$a) {
 		exit;
 	}
 
-
 	$default = 'images/person-175.jpg';
 
 	if(isset($type)) {
@@ -94,50 +95,41 @@ function photo_init(&$a) {
 		foreach( Photo::supportedTypes() as $m=>$e){
 			$photo = str_replace(".$e",'',$photo);
 		}
-	
+
 		if(substr($photo,-2,1) == '-') {
 			$resolution = intval(substr($photo,-1,1));
 			$photo = substr($photo,0,-2);
 		}
 
-		$r = q("SELECT `uid` FROM `photo` WHERE `resource-id` = '%s' AND `scale` = %d LIMIT 1",
+        // check if the photo exists and get the owner of the photo
+		$r = q("SELECT `uid` FROM `photo` WHERE `resource-id` = '%s' LIMIT 1",
 			dbesc($photo),
 			intval($resolution)
 		);
 		if(count($r)) {
-			
+
 			$sql_extra = permissions_sql($r[0]['uid']);
 
 			// Now we'll see if we can access the photo
 
-			$r = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `scale` = %d $sql_extra LIMIT 1",
+			$r = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `scale` <= %d $sql_extra ORDER BY scale DESC LIMIT 1",
 				dbesc($photo),
 				intval($resolution)
 			);
 
+			$public = ($r[0]['allow_cid'] == '') AND ($r[0]['allow_gid'] == '') AND ($r[0]['deny_cid']  == '') AND ($r[0]['deny_gid']  == '');
+
 			if(count($r)) {
+				$resolution = $r[0]['scale'];
 				$data = $r[0]['data'];
 				$mimetype = $r[0]['type'];
-			}
-			else {
-
-				// Does the picture exist? It may be a remote person with no credentials,
-				// but who should otherwise be able to view it. Show a default image to let 
-				// them know permissions was denied. It may be possible to view the image 
-				// through an authenticated profile visit.
-				// There won't be many completely unauthorised people seeing this because
-				// they won't have the photo link, so there's a reasonable chance that the person
-				// might be able to obtain permission to view it.
- 
-				$r = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `scale` = %d LIMIT 1",
-					dbesc($photo),
-					intval($resolution)
-				);
-				if(count($r)) {
-					$data = file_get_contents('images/nosign.jpg');
-					$mimetype = 'image/jpeg';
-					$prvcachecontrol = true;
-				}
+			} else {
+				// The picure exists. We already checked with the first query.
+				// obviously, this is not an authorized viev!
+				$data = file_get_contents('images/nosign.jpg');
+				$mimetype = 'image/jpeg';
+				$prvcachecontrol = true;
+				$public = false;
 			}
 		}
 	}
@@ -166,19 +158,18 @@ function photo_init(&$a) {
 		}
 	}
 
-	if(isset($customres) && $customres > 0 && $customres < 500) {
+	// Resize only if its not a GIF
+	if ($mime != "image/gif") {
 		$ph = new Photo($data, $mimetype);
 		if($ph->is_valid()) {
-			$ph->scaleImageSquare($customres);
+			if(isset($customres) && $customres > 0 && $customres < 500) {
+				$ph->scaleImageSquare($customres);
+			}
 			$data = $ph->imageString();
 			$mimetype = $ph->getType();
 		}
 	}
 
-	// Writing in cachefile
-	if (isset($cachefile) && $cachefile != '')
-		file_put_contents($cachefile, $data);
-
 	if(function_exists('header_remove')) {
 		header_remove('Pragma');
 		header_remove('pragma');
@@ -202,6 +193,18 @@ function photo_init(&$a) {
 		header("Cache-Control: max-age=31536000");
 	}
 	echo $data;
+
+	// If the photo is public and there is an existing photo directory store the photo there
+	if ($public and ($file != "")) {
+		// If the photo path isn't there, try to create it
+		if (!is_dir($_SERVER["DOCUMENT_ROOT"]."/photo"))
+			if (is_writable($_SERVER["DOCUMENT_ROOT"]))
+				mkdir($_SERVER["DOCUMENT_ROOT"]."/photo");
+
+		if (is_dir($_SERVER["DOCUMENT_ROOT"]."/photo"))
+			file_put_contents($_SERVER["DOCUMENT_ROOT"]."/photo/".$file, $data);
+	}
+
 	killme();
 	// NOTREACHED
 }