]> git.mxchange.org Git - friendica.git/blobdiff - mod/photos.php
Rename dbesc to DBA::escape
[friendica.git] / mod / photos.php
index 8798cbb7a8836c9395fc0ee69d5d2a8817724da0..fb66cef1dbe2579ee1499064c950682ad18627b8 100644 (file)
@@ -14,7 +14,6 @@ use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
-use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
 use Friendica\Model\Item;
@@ -46,10 +45,10 @@ function photos_init(App $a) {
        if ($a->argc > 1) {
                $nick = $a->argv[1];
                $user = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 LIMIT 1",
-                       dbesc($nick)
+                       DBA::escape($nick)
                );
 
-               if (!DBM::is_result($user)) {
+               if (!DBA::isResult($user)) {
                        return;
                }
 
@@ -119,13 +118,15 @@ function photos_init(App $a) {
                }
 
 
-               if (!x($a->page, 'aside')) {
+               if (empty($a->page['aside'])) {
                        $a->page['aside'] = '';
                }
+
                $a->page['aside'] .= $vcard_widget;
                $a->page['aside'] .= $photo_albums_widget;
 
                $tpl = get_markup_template("photos_head.tpl");
+
                $a->page['htmlhead'] .= replace_macros($tpl,[
                        '$ispublic' => L10n::t('everybody')
                ]);
@@ -150,26 +151,27 @@ function photos_post(App $a)
 
        if (local_user() && (local_user() == $page_owner_uid)) {
                $can_post = true;
-       } else {
-               if ($community_page && remote_user()) {
-                       $contact_id = 0;
-                       if (x($_SESSION, 'remote') && is_array($_SESSION['remote'])) {
-                               foreach ($_SESSION['remote'] as $v) {
-                                       if ($v['uid'] == $page_owner_uid) {
-                                               $contact_id = $v['cid'];
-                                               break;
-                                       }
+       } elseif ($community_page && remote_user()) {
+               $contact_id = 0;
+
+               if (!empty($_SESSION['remote']) && is_array($_SESSION['remote'])) {
+                       foreach ($_SESSION['remote'] as $v) {
+                               if ($v['uid'] == $page_owner_uid) {
+                                       $contact_id = $v['cid'];
+                                       break;
                                }
                        }
-                       if ($contact_id) {
-                               $r = q("SELECT `uid` FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `id` = %d AND `uid` = %d LIMIT 1",
-                                       intval($contact_id),
-                                       intval($page_owner_uid)
-                               );
-                               if (DBM::is_result($r)) {
-                                       $can_post = true;
-                                       $visitor = $contact_id;
-                               }
+               }
+
+               if ($contact_id) {
+                       $r = q("SELECT `uid` FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `id` = %d AND `uid` = %d LIMIT 1",
+                               intval($contact_id),
+                               intval($page_owner_uid)
+                       );
+
+                       if (DBA::isResult($r)) {
+                               $can_post = true;
+                               $visitor = $contact_id;
                        }
                }
        }
@@ -196,10 +198,10 @@ function photos_post(App $a)
                }
 
                $r = q("SELECT `album` FROM `photo` WHERE `album` = '%s' AND `uid` = %d",
-                       dbesc($album),
+                       DBA::escape($album),
                        intval($page_owner_uid)
                );
-               if (!DBM::is_result($r)) {
+               if (!DBA::isResult($r)) {
                        notice(L10n::t('Album not found.') . EOL);
                        goaway($_SESSION['photo_return']);
                        return; // NOTREACHED
@@ -214,8 +216,8 @@ function photos_post(App $a)
                $newalbum = notags(trim($_POST['albumname']));
                if ($newalbum != $album) {
                        q("UPDATE `photo` SET `album` = '%s' WHERE `album` = '%s' AND `uid` = %d",
-                               dbesc($newalbum),
-                               dbesc($album),
+                               DBA::escape($newalbum),
+                               DBA::escape($album),
                                intval($page_owner_uid)
                        );
                        // Update the photo albums cache
@@ -232,11 +234,13 @@ function photos_post(App $a)
 
                if ($_POST['dropalbum'] == L10n::t('Delete Album')) {
                        // Check if we should do HTML-based delete confirmation
-                       if (x($_REQUEST, 'confirm')) {
+                       if (!empty($_REQUEST['confirm'])) {
                                $drop_url = $a->query_string;
+
                                $extra_inputs = [
                                        ['name' => 'albumname', 'value' => $_POST['albumname']],
                                ];
+
                                $a->page['content'] = replace_macros(get_markup_template('confirm.tpl'), [
                                        '$method' => 'post',
                                        '$message' => L10n::t('Do you really want to delete this photo album and all its photos?'),
@@ -258,17 +262,17 @@ function photos_post(App $a)
                                $r = q("SELECT distinct(`resource-id`) as `rid` FROM `photo` WHERE `contact-id` = %d AND `uid` = %d AND `album` = '%s'",
                                        intval($visitor),
                                        intval($page_owner_uid),
-                                       dbesc($album)
+                                       DBA::escape($album)
                                );
                        } else {
                                $r = q("SELECT distinct(`resource-id`) as `rid` FROM `photo` WHERE `uid` = %d AND `album` = '%s'",
                                        intval(local_user()),
-                                       dbesc($album)
+                                       DBA::escape($album)
                                );
                        }
-                       if (DBM::is_result($r)) {
+                       if (DBA::isResult($r)) {
                                foreach ($r as $rr) {
-                                       $res[] = "'" . dbesc($rr['rid']) . "'" ;
+                                       $res[] = "'" . DBA::escape($rr['rid']) . "'" ;
                                }
                        } else {
                                goaway($_SESSION['photo_return']);
@@ -295,7 +299,7 @@ function photos_post(App $a)
 
 
        // Check if the user has responded to a delete confirmation query for a single photo
-       if ($a->argc > 2 && x($_REQUEST, 'canceled')) {
+       if ($a->argc > 2 && !empty($_REQUEST['canceled'])) {
                goaway($_SESSION['photo_return']);
        }
 
@@ -304,7 +308,7 @@ function photos_post(App $a)
                // same as above but remove single photo
 
                // Check if we should do HTML-based delete confirmation
-               if (x($_REQUEST, 'confirm')) {
+               if (!empty($_REQUEST['confirm'])) {
                        $drop_url = $a->query_string;
                        $a->page['content'] = replace_macros(get_markup_template('confirm.tpl'), [
                                '$method' => 'post',
@@ -323,18 +327,19 @@ function photos_post(App $a)
                        $r = q("SELECT `id`, `resource-id` FROM `photo` WHERE `contact-id` = %d AND `uid` = %d AND `resource-id` = '%s' LIMIT 1",
                                intval($visitor),
                                intval($page_owner_uid),
-                               dbesc($a->argv[2])
+                               DBA::escape($a->argv[2])
                        );
                } else {
                        $r = q("SELECT `id`, `resource-id` FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s' LIMIT 1",
                                intval(local_user()),
-                               dbesc($a->argv[2])
+                               DBA::escape($a->argv[2])
                        );
                }
-               if (DBM::is_result($r)) {
+
+               if (DBA::isResult($r)) {
                        q("DELETE FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s'",
                                intval($page_owner_uid),
-                               dbesc($r[0]['resource-id'])
+                               DBA::escape($r[0]['resource-id'])
                        );
 
                        Item::deleteForUser(['resource-id' => $r[0]['resource-id'], 'uid' => $page_owner_uid], $page_owner_uid);
@@ -347,16 +352,17 @@ function photos_post(App $a)
                return; // NOTREACHED
        }
 
-       if ($a->argc > 2 && (x($_POST, 'desc') !== false || x($_POST, 'newtag') !== false || x($_POST, 'albname') !== false)) {
-               $desc        = x($_POST, 'desc')      ? notags(trim($_POST['desc']))      : '';
-               $rawtags     = x($_POST, 'newtag')    ? notags(trim($_POST['newtag']))    : '';
-               $item_id     = x($_POST, 'item_id')   ? intval($_POST['item_id'])         : 0;
-               $albname     = x($_POST, 'albname')   ? notags(trim($_POST['albname']))   : '';
-               $origaname   = x($_POST, 'origaname') ? notags(trim($_POST['origaname'])) : '';
-               $str_group_allow   = perms2str($_POST['group_allow']);
-               $str_contact_allow = perms2str($_POST['contact_allow']);
-               $str_group_deny    = perms2str($_POST['group_deny']);
-               $str_contact_deny  = perms2str($_POST['contact_deny']);
+       if ($a->argc > 2 && (!empty($_POST['desc']) || !empty($_POST['newtag']) || !empty($_POST['albname']) !== false)) {
+               $desc        = !empty($_POST['desc'])      ? notags(trim($_POST['desc']))      : '';
+               $rawtags     = !empty($_POST['newtag'])    ? notags(trim($_POST['newtag']))    : '';
+               $item_id     = !empty($_POST['item_id'])   ? intval($_POST['item_id'])         : 0;
+               $albname     = !empty($_POST['albname'])   ? notags(trim($_POST['albname']))   : '';
+               $origaname   = !empty($_POST['origaname']) ? notags(trim($_POST['origaname'])) : '';
+
+               $str_group_allow   = !empty($_POST['group_allow'])   ? perms2str($_POST['group_allow'])   : '';
+               $str_contact_allow = !empty($_POST['contact_allow']) ? perms2str($_POST['contact_allow']) : '';
+               $str_group_deny    = !empty($_POST['group_deny'])    ? perms2str($_POST['group_deny'])    : '';
+               $str_contact_deny  = !empty($_POST['contact_deny'])  ? perms2str($_POST['contact_deny'])  : '';
 
                $resource_id = $a->argv[2];
 
@@ -364,55 +370,56 @@ function photos_post(App $a)
                        $albname = DateTimeFormat::localNow('Y');
                }
 
-               if (x($_POST,'rotate') !== false &&
-                  (intval($_POST['rotate']) == 1 || intval($_POST['rotate']) == 2)) {
+               if (!empty($_POST['rotate']) && (intval($_POST['rotate']) == 1 || intval($_POST['rotate']) == 2)) {
                        logger('rotate');
 
                        $r = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `uid` = %d AND `scale` = 0 LIMIT 1",
-                               dbesc($resource_id),
+                               DBA::escape($resource_id),
                                intval($page_owner_uid)
                        );
-                       if (DBM::is_result($r)) {
-                               $Image = new Image($r[0]['data'], $r[0]['type']);
-                               if ($Image->isValid()) {
+
+                       if (DBA::isResult($r)) {
+                               $image = new Image($r[0]['data'], $r[0]['type']);
+
+                               if ($image->isValid()) {
                                        $rotate_deg = ((intval($_POST['rotate']) == 1) ? 270 : 90);
-                                       $Image->rotate($rotate_deg);
+                                       $image->rotate($rotate_deg);
 
-                                       $width  = $Image->getWidth();
-                                       $height = $Image->getHeight();
+                                       $width  = $image->getWidth();
+                                       $height = $image->getHeight();
 
                                        $x = q("UPDATE `photo` SET `data` = '%s', `height` = %d, `width` = %d WHERE `resource-id` = '%s' AND `uid` = %d AND `scale` = 0",
-                                               dbesc($Image->asString()),
+                                               DBA::escape($image->asString()),
                                                intval($height),
                                                intval($width),
-                                               dbesc($resource_id),
+                                               DBA::escape($resource_id),
                                                intval($page_owner_uid)
                                        );
 
                                        if ($width > 640 || $height > 640) {
-                                               $Image->scaleDown(640);
-                                               $width  = $Image->getWidth();
-                                               $height = $Image->getHeight();
+                                               $image->scaleDown(640);
+                                               $width  = $image->getWidth();
+                                               $height = $image->getHeight();
 
                                                $x = q("UPDATE `photo` SET `data` = '%s', `height` = %d, `width` = %d WHERE `resource-id` = '%s' AND `uid` = %d AND `scale` = 1",
-                                                       dbesc($Image->asString()),
+                                                       DBA::escape($image->asString()),
                                                        intval($height),
                                                        intval($width),
-                                                       dbesc($resource_id),
+                                                       DBA::escape($resource_id),
                                                        intval($page_owner_uid)
                                                );
                                        }
 
                                        if ($width > 320 || $height > 320) {
-                                               $Image->scaleDown(320);
-                                               $width  = $Image->getWidth();
-                                               $height = $Image->getHeight();
+                                               $image->scaleDown(320);
+                                               $width  = $image->getWidth();
+                                               $height = $image->getHeight();
 
                                                $x = q("UPDATE `photo` SET `data` = '%s', `height` = %d, `width` = %d WHERE `resource-id` = '%s' AND `uid` = %d AND `scale` = 2",
-                                                       dbesc($Image->asString()),
+                                                       DBA::escape($image->asString()),
                                                        intval($height),
                                                        intval($width),
-                                                       dbesc($resource_id),
+                                                       DBA::escape($resource_id),
                                                        intval($page_owner_uid)
                                                );
                                        }
@@ -421,19 +428,19 @@ function photos_post(App $a)
                }
 
                $p = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `uid` = %d ORDER BY `scale` DESC",
-                       dbesc($resource_id),
+                       DBA::escape($resource_id),
                        intval($page_owner_uid)
                );
-               if (DBM::is_result($p)) {
+               if (DBA::isResult($p)) {
                        $ext = $phototypes[$p[0]['type']];
                        $r = q("UPDATE `photo` SET `desc` = '%s', `album` = '%s', `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s' WHERE `resource-id` = '%s' AND `uid` = %d",
-                               dbesc($desc),
-                               dbesc($albname),
-                               dbesc($str_contact_allow),
-                               dbesc($str_group_allow),
-                               dbesc($str_contact_deny),
-                               dbesc($str_group_deny),
-                               dbesc($resource_id),
+                               DBA::escape($desc),
+                               DBA::escape($albname),
+                               DBA::escape($str_contact_allow),
+                               DBA::escape($str_group_allow),
+                               DBA::escape($str_contact_deny),
+                               DBA::escape($str_group_deny),
+                               DBA::escape($resource_id),
                                intval($page_owner_uid)
                        );
 
@@ -488,7 +495,7 @@ function photos_post(App $a)
                if ($item_id) {
                        $item = Item::selectFirst(['tag', 'inform'], ['id' => $item_id, 'uid' => $page_owner_uid]);
                }
-               if (DBM::is_result($item)) {
+               if (DBA::isResult($item)) {
                        $old_tag    = $item['tag'];
                        $old_inform = $item['inform'];
                }
@@ -547,21 +554,21 @@ function photos_post(App $a)
 
                                                                //select someone from this user's contacts by name
                                                                $r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1",
-                                                                               dbesc($newname),
+                                                                               DBA::escape($newname),
                                                                                intval($page_owner_uid)
                                                                );
 
-                                                               if (!DBM::is_result($r)) {
+                                                               if (!DBA::isResult($r)) {
                                                                        //select someone by attag or nick and the name passed in
                                                                        $r = q("SELECT * FROM `contact` WHERE `attag` = '%s' OR `nick` = '%s' AND `uid` = %d ORDER BY `attag` DESC LIMIT 1",
-                                                                                       dbesc($name),
-                                                                                       dbesc($name),
+                                                                                       DBA::escape($name),
+                                                                                       DBA::escape($name),
                                                                                        intval($page_owner_uid)
                                                                        );
                                                                }
                                                        }
 
-                                                       if (DBM::is_result($r)) {
+                                                       if (DBA::isResult($r)) {
                                                                $newname = $r[0]['name'];
                                                                $profile = $r[0]['url'];
                                                                $notify = 'cid:' . $r[0]['id'];
@@ -678,8 +685,8 @@ function photos_post(App $a)
        Addon::callHooks('photo_post_init', $_POST);
 
        // Determine the album to use
-       $album    = x($_REQUEST, 'album') ? notags(trim($_REQUEST['album'])) : '';
-       $newalbum = x($_REQUEST, 'newalbum') ? notags(trim($_REQUEST['newalbum'])) : '';
+       $album    = !empty($_REQUEST['album'])    ? notags(trim($_REQUEST['album']))    : '';
+       $newalbum = !empty($_REQUEST['newalbum']) ? notags(trim($_REQUEST['newalbum'])) : '';
 
        logger('mod/photos.php: photos_post(): album= ' . $album . ' newalbum= ' . $newalbum , LOGGER_DEBUG);
 
@@ -700,16 +707,17 @@ function photos_post(App $a)
         */
 
        $r = q("SELECT * FROM `photo` WHERE `album` = '%s' AND `uid` = %d AND `created` > UTC_TIMESTAMP() - INTERVAL 3 HOUR ",
-               dbesc($album),
+               DBA::escape($album),
                intval($page_owner_uid)
        );
-       if (!DBM::is_result($r) || ($album == L10n::t('Profile Photos'))) {
+
+       if (!DBA::isResult($r) || ($album == L10n::t('Profile Photos'))) {
                $visible = 1;
        } else {
                $visible = 0;
        }
 
-       if (x($_REQUEST, 'not_visible') && $_REQUEST['not_visible'] !== 'false') {
+       if (!empty($_REQUEST['not_visible']) && $_REQUEST['not_visible'] !== 'false') {
                $visible = 0;
        }
 
@@ -727,7 +735,7 @@ function photos_post(App $a)
 
        Addon::callHooks('photo_post_file', $ret);
 
-       if (x($ret, 'src') && x($ret, 'filesize')) {
+       if (!empty($ret['src']) && !empty($ret['filesize'])) {
                $src      = $ret['src'];
                $filename = $ret['filename'];
                $filesize = $ret['filesize'];
@@ -795,9 +803,9 @@ function photos_post(App $a)
 
        $imagedata = @file_get_contents($src);
 
-       $Image = new Image($imagedata, $type);
+       $image = new Image($imagedata, $type);
 
-       if (!$Image->isValid()) {
+       if (!$image->isValid()) {
                logger('mod/photos.php: photos_post(): unable to process image' , LOGGER_DEBUG);
                notice(L10n::t('Unable to process image.') . EOL);
                @unlink($src);
@@ -806,7 +814,7 @@ function photos_post(App $a)
                killme();
        }
 
-       $exif = $Image->orient($src);
+       $exif = $image->orient($src);
        @unlink($src);
 
        $max_length = Config::get('system', 'max_image_length');
@@ -814,17 +822,17 @@ function photos_post(App $a)
                $max_length = MAX_IMAGE_LENGTH;
        }
        if ($max_length > 0) {
-               $Image->scaleDown($max_length);
+               $image->scaleDown($max_length);
        }
 
-       $width  = $Image->getWidth();
-       $height = $Image->getHeight();
+       $width  = $image->getWidth();
+       $height = $image->getHeight();
 
        $smallest = 0;
 
        $photo_hash = Photo::newResource();
 
-       $r = Photo::store($Image, $page_owner_uid, $visitor, $photo_hash, $filename, $album, 0 , 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
+       $r = Photo::store($image, $page_owner_uid, $visitor, $photo_hash, $filename, $album, 0 , 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
 
        if (!$r) {
                logger('mod/photos.php: photos_post(): image store failed', LOGGER_DEBUG);
@@ -833,14 +841,14 @@ function photos_post(App $a)
        }
 
        if ($width > 640 || $height > 640) {
-               $Image->scaleDown(640);
-               Photo::store($Image, $page_owner_uid, $visitor, $photo_hash, $filename, $album, 1, 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
+               $image->scaleDown(640);
+               Photo::store($image, $page_owner_uid, $visitor, $photo_hash, $filename, $album, 1, 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
                $smallest = 1;
        }
 
        if ($width > 320 || $height > 320) {
-               $Image->scaleDown(320);
-               Photo::store($Image, $page_owner_uid, $visitor, $photo_hash, $filename, $album, 2, 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
+               $image->scaleDown(320);
+               Photo::store($image, $page_owner_uid, $visitor, $photo_hash, $filename, $album, 2, 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
                $smallest = 2;
        }
 
@@ -881,7 +889,7 @@ function photos_post(App $a)
        $arr['origin']        = 1;
 
        $arr['body']          = '[url=' . System::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $photo_hash . ']'
-                               . '[img]' . System::baseUrl() . "/photo/{$photo_hash}-{$smallest}.".$Image->getExt() . '[/img]'
+                               . '[img]' . System::baseUrl() . "/photo/{$photo_hash}-{$smallest}.".$image->getExt() . '[/img]'
                                . '[/url]';
 
        $item_id = Item::insert($arr);
@@ -920,7 +928,7 @@ function photos_content(App $a)
        require_once 'include/security.php';
        require_once 'include/conversation.php';
 
-       if (!x($a->data,'user')) {
+       if (empty($a->data['user'])) {
                notice(L10n::t('No photos selected') . EOL);
                return;
        }
@@ -976,7 +984,7 @@ function photos_content(App $a)
                                        intval($contact_id),
                                        intval($owner_uid)
                                );
-                               if (DBM::is_result($r)) {
+                               if (DBA::isResult($r)) {
                                        $can_post = true;
                                        $contact = $r[0];
                                        $remote_contact = true;
@@ -1005,7 +1013,7 @@ function photos_content(App $a)
                                intval($contact_id),
                                intval($owner_uid)
                        );
-                       if (DBM::is_result($r)) {
+                       if (DBA::isResult($r)) {
                                $contact = $r[0];
                                $remote_contact = true;
                        }
@@ -1103,9 +1111,9 @@ function photos_content(App $a)
                $r = q("SELECT `resource-id`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = %d AND `album` = '%s'
                        AND `scale` <= 4 $sql_extra GROUP BY `resource-id`",
                        intval($owner_uid),
-                       dbesc($album)
+                       DBA::escape($album)
                );
-               if (DBM::is_result($r)) {
+               if (DBA::isResult($r)) {
                        $a->set_pager_total(count($r));
                        $a->set_pager_itemspage(20);
                }
@@ -1124,7 +1132,7 @@ function photos_content(App $a)
                        FROM `photo` WHERE `uid` = %d AND `album` = '%s'
                        AND `scale` <= 4 $sql_extra GROUP BY `resource-id` ORDER BY `created` $order LIMIT %d , %d",
                        intval($owner_uid),
-                       dbesc($album),
+                       DBA::escape($album),
                        intval($a->pager['start']),
                        intval($a->pager['itemspage'])
                );
@@ -1154,14 +1162,14 @@ function photos_content(App $a)
                }
 
                if ($order_field === 'posted') {
-                       $order =  [L10n::t('Show Newest First'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album)];
+                       $order =  [L10n::t('Show Newest First'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album), 'oldest'];
                } else {
-                       $order = [L10n::t('Show Oldest First'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album) . '?f=&order=posted'];
+                       $order = [L10n::t('Show Oldest First'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album) . '?f=&order=posted', 'newest'];
                }
 
                $photos = [];
 
-               if (DBM::is_result($r)) {
+               if (DBA::isResult($r)) {
                        // "Twist" is only used for the duepunto theme with style "slackr"
                        $twist = false;
                        foreach ($r as $rr) {
@@ -1208,16 +1216,16 @@ function photos_content(App $a)
                $ph = q("SELECT * FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s'
                        $sql_extra ORDER BY `scale` ASC ",
                        intval($owner_uid),
-                       dbesc($datum)
+                       DBA::escape($datum)
                );
 
-               if (!DBM::is_result($ph)) {
+               if (!DBA::isResult($ph)) {
                        $ph = q("SELECT `id` FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s'
                                LIMIT 1",
                                intval($owner_uid),
-                               dbesc($datum)
+                               DBA::escape($datum)
                        );
-                       if (DBM::is_result($ph)) {
+                       if (DBA::isResult($ph)) {
                                notice(L10n::t('Permission denied. Access to this item may be restricted.'));
                        } else {
                                notice(L10n::t('Photo not available') . EOL);
@@ -1244,11 +1252,11 @@ function photos_content(App $a)
 
                        $prvnxt = q("SELECT `resource-id` FROM `photo` WHERE `album` = '%s' AND `uid` = %d AND `scale` = 0
                                $sql_extra ORDER BY `created` $order ",
-                               dbesc($ph[0]['album']),
+                               DBA::escape($ph[0]['album']),
                                intval($owner_uid)
                        );
 
-                       if (DBM::is_result($prvnxt)) {
+                       if (DBA::isResult($prvnxt)) {
                                foreach ($prvnxt as $z => $entry) {
                                        if ($entry['resource-id'] == $ph[0]['resource-id']) {
                                                $prv = $z - 1;
@@ -1339,13 +1347,13 @@ function photos_content(App $a)
 
                /// @todo Rewrite this query. To do so, $sql_extra must be changed
                $linked_items = q("SELECT `id` FROM `item` WHERE `resource-id` = '%s' $sql_extra LIMIT 1",
-                       dbesc($datum)
+                       DBA::escape($datum)
                );
 
                $map = null;
                $link_item = [];
 
-               if (DBM::is_result($linked_items)) {
+               if (DBA::isResult($linked_items)) {
                        // This is a workaround to not being forced to rewrite the while $sql_extra handling
                        $link_item = Item::selectFirst([], ['id' => $linked_items[0]['id']]);
 
@@ -1441,7 +1449,7 @@ function photos_content(App $a)
                                ]);
                        }
 
-                       if (!DBM::is_result($items)) {
+                       if (!DBA::isResult($items)) {
                                if (($can_post || can_write_wall($owner_uid))) {
                                        $comments .= replace_macros($cmnt_tpl, [
                                                '$return_path' => '',
@@ -1468,15 +1476,16 @@ function photos_content(App $a)
                        ];
 
                        // display comments
-                       if (DBM::is_result($items)) {
+                       if (DBA::isResult($items)) {
                                foreach ($items as $item) {
                                        builtin_activity_puller($item, $conv_responses);
                                }
 
-                               if (x($conv_responses['like'], $link_item['uri'])) {
+                               if (!empty($conv_responses['like'][$link_item['uri']])) {
                                        $like = format_like($conv_responses['like'][$link_item['uri']], $conv_responses['like'][$link_item['uri'] . '-l'], 'like', $link_item['id']);
                                }
-                               if (x($conv_responses['dislike'], $link_item['uri'])) {
+
+                               if (!empty($conv_responses['dislike'][$link_item['uri']])) {
                                        $dislike = format_like($conv_responses['dislike'][$link_item['uri']], $conv_responses['dislike'][$link_item['uri'] . '-l'], 'dislike', $link_item['id']);
                                }
 
@@ -1606,10 +1615,11 @@ function photos_content(App $a)
        $r = q("SELECT `resource-id`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = %d AND `album` != '%s' AND `album` != '%s'
                $sql_extra GROUP BY `resource-id`",
                intval($a->data['user']['uid']),
-               dbesc('Contact Photos'),
-               dbesc(L10n::t('Contact Photos'))
+               DBA::escape('Contact Photos'),
+               DBA::escape(L10n::t('Contact Photos'))
        );
-       if (DBM::is_result($r)) {
+
+       if (DBA::isResult($r)) {
                $a->set_pager_total(count($r));
                $a->set_pager_itemspage(20);
        }
@@ -1620,14 +1630,14 @@ function photos_content(App $a)
                WHERE `uid` = %d AND `album` != '%s' AND `album` != '%s'
                $sql_extra GROUP BY `resource-id` ORDER BY `created` DESC LIMIT %d , %d",
                intval($a->data['user']['uid']),
-               dbesc('Contact Photos'),
-               dbesc(L10n::t('Contact Photos')),
+               DBA::escape('Contact Photos'),
+               DBA::escape(L10n::t('Contact Photos')),
                intval($a->pager['start']),
                intval($a->pager['itemspage'])
        );
 
        $photos = [];
-       if (DBM::is_result($r)) {
+       if (DBA::isResult($r)) {
                // "Twist" is only used for the duepunto theme with style "slackr"
                $twist = false;
                foreach ($r as $rr) {
@@ -1644,16 +1654,16 @@ function photos_content(App $a)
                        $name_e = $rr['album'];
 
                        $photos[] = [
-                               'id'            => $rr['id'],
-                               'twist'         => ' ' . ($twist ? 'rotleft' : 'rotright') . rand(2,4),
-                               'link'          => 'photos/' . $a->data['user']['nickname'] . '/image/' . $rr['resource-id'],
-                               'title'         => L10n::t('View Photo'),
-                               'src'           => 'photo/' . $rr['resource-id'] . '-' . ((($rr['scale']) == 6) ? 4 : $rr['scale']) . '.' . $ext,
-                               'alt'           => $alt_e,
-                               'album' => [
-                                       'link'  => 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($rr['album']),
-                                       'name'  => $name_e,
-                                       'alt'   => L10n::t('View Album'),
+                               'id'    => $rr['id'],
+                               'twist' => ' ' . ($twist ? 'rotleft' : 'rotright') . rand(2,4),
+                               'link'  => 'photos/' . $a->data['user']['nickname'] . '/image/' . $rr['resource-id'],
+                               'title' => L10n::t('View Photo'),
+                               'src'   => 'photo/' . $rr['resource-id'] . '-' . ((($rr['scale']) == 6) ? 4 : $rr['scale']) . '.' . $ext,
+                               'alt'   => $alt_e,
+                               'album' => [
+                                       'link' => 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($rr['album']),
+                                       'name' => $name_e,
+                                       'alt'  => L10n::t('View Album'),
                                ],
 
                        ];