X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fphoto.php;h=a94a3ac2ce57eb97f260689e6cb699b2766ce94f;hb=db2d0e009503539b134fd43837d440028d5b8de7;hp=497dcd750660ea43722e8b43a8fa3c4e430d9cef;hpb=0d4d15c73d0bd7f571753d40937ead4c55a797b8;p=friendica.git

diff --git a/mod/photo.php b/mod/photo.php
index 497dcd7506..a94a3ac2ce 100644
--- a/mod/photo.php
+++ b/mod/photo.php
@@ -72,11 +72,11 @@ function photo_init(&$a) {
 
 		$uid = str_replace(array('.jpg','.png'),array('',''), $person);
 
-		$r = q("SELECT * FROM `photo` WHERE `scale` = %d AND `uid` = %d AND `profile` = 1 LIMIT 1",
+		$r = qu("SELECT * FROM `photo` WHERE `scale` = %d AND `uid` = %d AND `profile` = 1 LIMIT 1",
 			intval($resolution),
 			intval($uid)
 		);
-		if(count($r)) {
+		if (dbm::is_result($r)) {
 			$data = $r[0]['data'];
 			$mimetype = $r[0]['type'];
 		}
@@ -101,46 +101,35 @@ function photo_init(&$a) {
 			$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 = qu("SELECT `uid` FROM `photo` WHERE `resource-id` = '%s' LIMIT 1",
 			dbesc($photo),
 			intval($resolution)
 		);
-		if(count($r)) {
+		if (dbm::is_result($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 = qu("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']  == '');
+			$public = (dbm::is_result($r)) AND ($r[0]['allow_cid'] == '') AND ($r[0]['allow_gid'] == '') AND ($r[0]['deny_cid']  == '') AND ($r[0]['deny_gid']  == '');
 
-			if(count($r)) {
+			if (dbm::is_result($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;
 			}
 		}
 	}
@@ -206,9 +195,16 @@ function photo_init(&$a) {
 	echo $data;
 
 	// If the photo is public and there is an existing photo directory store the photo there
-	if ($public and ($file != ""))
-		if (is_dir($_SERVER["DOCUMENT_ROOT"]."/photo"))
-			file_put_contents($_SERVER["DOCUMENT_ROOT"]."/photo/".$file, $data);
+	if ($public and ($file != "")) {
+		// If the photo path isn't there, try to create it
+		$basepath = $a->get_basepath();
+		if (!is_dir($basepath."/photo"))
+			if (is_writable($basepath))
+				mkdir($basepath."/photo");
+
+		if (is_dir($basepath."/photo"))
+			file_put_contents($basepath."/photo/".$file, $data);
+	}
 
 	killme();
 	// NOTREACHED