X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fphoto.php;h=6562599ca3cf0ccc5b19e997b2734fcbdd408e0d;hb=caad9f5214f9f8c94e487629007b0f33c1b2008d;hp=fab34a62f03b395f33749d12e5cbb7b0e2634319;hpb=ca1f408f9b5ae5296bcbb1e34a5bb57165fe4d06;p=friendica.git

diff --git a/mod/photo.php b/mod/photo.php
index fab34a62f0..6562599ca3 100644
--- a/mod/photo.php
+++ b/mod/photo.php
@@ -3,7 +3,7 @@
 require_once('include/security.php');
 require_once('include/Photo.php');
 
-function photo_init(&$a) {
+function photo_init(App $a) {
 	global $_SERVER;
 
 	$prvcachecontrol = false;
@@ -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'];
 		}
@@ -102,24 +102,24 @@ function photo_init(&$a) {
 		}
 
         // check if the photo exists and get the owner of the photo
-		$r = q("SELECT `uid` FROM `photo` WHERE `resource-id` = '%s' LIMIT 1",
+		$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 ORDER BY scale DESC 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'];
@@ -197,12 +197,13 @@ function photo_init(&$a) {
 	// 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");
+		$basepath = $a->get_basepath();
+		if (!is_dir($basepath."/photo"))
+			if (is_writable($basepath))
+				mkdir($basepath."/photo");
 
-		if (is_dir($_SERVER["DOCUMENT_ROOT"]."/photo"))
-			file_put_contents($_SERVER["DOCUMENT_ROOT"]."/photo/".$file, $data);
+		if (is_dir($basepath."/photo"))
+			file_put_contents($basepath."/photo/".$file, $data);
 	}
 
 	killme();