X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fphoto.php;h=3c5fdd7be4bde26b5fb375e9cbab1b8143b1bf7d;hb=5d7e1e1a1544421c594e13efb9c1ebece241e94f;hp=3baff13db5d7c03592d01bc3b8b73d7a0fa142cd;hpb=0c67c89715df801e0c887be50c9739db3bae7ca3;p=friendica.git

diff --git a/mod/photo.php b/mod/photo.php
index 3baff13db5..3c5fdd7be4 100644
--- a/mod/photo.php
+++ b/mod/photo.php
@@ -1,10 +1,11 @@
 <?php
 
+use Friendica\App;
+
 require_once('include/security.php');
 require_once('include/Photo.php');
 
-if(! function_exists('photo_init')) {
-function photo_init(&$a) {
+function photo_init(App $a) {
 	global $_SERVER;
 
 	$prvcachecontrol = false;
@@ -73,11 +74,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'];
 		}
@@ -103,24 +104,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)) && ($r[0]['allow_cid'] == '') && ($r[0]['allow_gid'] == '') && ($r[0]['deny_cid']  == '') && ($r[0]['deny_gid']  == '');
 
-			if(count($r)) {
+			if (dbm::is_result($r)) {
 				$resolution = $r[0]['scale'];
 				$data = $r[0]['data'];
 				$mimetype = $r[0]['type'];
@@ -210,4 +211,3 @@ function photo_init(&$a) {
 	killme();
 	// NOTREACHED
 }
-}