]> git.mxchange.org Git - friendica.git/blobdiff - mod/display.php
Updating after post does now work
[friendica.git] / mod / display.php
index 0d347882e2b16c95120a5fcbd4f16e5c146d96ab..012bc5e61a67cdc5732ee18dea3f792bc8d855f5 100644 (file)
@@ -1,12 +1,15 @@
 <?php
 
 use Friendica\App;
-
-require_once('include/dfrn.php');
+use Friendica\Core\Config;
+use Friendica\Core\System;
+use Friendica\Database\DBM;
+use Friendica\Model\Contact;
+use Friendica\Protocol\DFRN;
 
 function display_init(App $a) {
 
-       if ((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
+       if ((Config::get('system','block_public')) && (! local_user()) && (! remote_user())) {
                return;
        }
 
@@ -16,109 +19,103 @@ function display_init(App $a) {
        if ($a->argc == 3) {
                if (substr($a->argv[2], -5) == '.atom') {
                        $item_id = substr($a->argv[2], 0, -5);
-                       $xml = dfrn::itemFeed($item_id);
-                       if ($xml == '') {
-                               http_status_exit(500);
-                       }
-                       header("Content-type: application/atom+xml");
-                       echo $xml;
-                       killme();
+                       displayShowFeed($item_id, false);
+               }
+       }
+
+       if ($a->argc == 4) {
+               if ($a->argv[3] == 'conversation.atom') {
+                       $item_id = $a->argv[2];
+                       displayShowFeed($item_id, true);
                }
        }
 
+       $r = false;
+
        // If there is only one parameter, then check if this parameter could be a guid
        if ($a->argc == 2) {
                $nick = "";
-               $itemuid = 0;
+               $r = false;
 
                // Does the local user have this item?
                if (local_user()) {
-                       $r = qu("SELECT `id`, `parent`, `author-name`, `author-link`, `author-avatar`, `network`, `body`, `uid`, `owner-link` FROM `item`
-                               WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
-                                       AND `guid` = '%s' AND `uid` = %d", dbesc($a->argv[1]), local_user());
-                       if (dbm::is_result($r)) {
+                       $r = dba::fetch_first("SELECT `id`, `parent`, `author-name`, `author-link`,
+                                               `author-avatar`, `network`, `body`, `uid`, `owner-link`
+                               FROM `item` WHERE `visible` AND NOT `deleted` AND NOT `moderated`
+                                       AND `guid` = ? AND `uid` = ? LIMIT 1", $a->argv[1], local_user());
+                       if (DBM::is_result($r)) {
                                $nick = $a->user["nickname"];
-                               $itemuid = local_user();
                        }
                }
 
+               // Is it an item with uid=0?
+               if (!DBM::is_result($r)) {
+                       $r = dba::fetch_first("SELECT `id`, `parent`, `author-name`, `author-link`,
+                                               `author-avatar`, `network`, `body`, `uid`, `owner-link`
+                               FROM `item` WHERE `visible` AND NOT `deleted` AND NOT `moderated`
+                                       AND `allow_cid` = ''  AND `allow_gid` = ''
+                                       AND `deny_cid`  = '' AND `deny_gid`  = ''
+                                       AND NOT `private` AND `uid` = 0
+                                       AND `guid` = ? LIMIT 1", $a->argv[1]);
+               }
+
                // Or is it anywhere on the server?
-               if ($nick == "") {
-                       $r = qu("SELECT `user`.`nickname`, `item`.`id`, `item`.`parent`, `item`.`author-name`,
-                               `item`.`author-link`, `item`.`author-avatar`, `item`.`network`, `item`.`uid`, `item`.`owner-link`, `item`.`body`
+               if (!DBM::is_result($r)) {
+                       $r = dba::fetch_first("SELECT `item`.`id`, `item`.`parent`, `item`.`author-name`, `item`.`author-link`,
+                               `item`.`author-avatar`, `item`.`network`, `item`.`body`, `item`.`uid`, `item`.`owner-link`
                                FROM `item` STRAIGHT_JOIN `user` ON `user`.`uid` = `item`.`uid`
                                WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
                                        AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = ''
                                        AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = ''
                                        AND NOT `item`.`private` AND NOT `user`.`hidewall`
-                                       AND `item`.`guid` = '%s'", dbesc($a->argv[1]));
-                       if (dbm::is_result($r)) {
-                               $nick = $r[0]["nickname"];
-                               $itemuid = $r[0]["uid"];
-                       }
+                                       AND `item`.`guid` = ? LIMIT 1", $a->argv[1]);
                }
 
-               // Is it an item with uid=0?
-               if ($nick == "") {
-                       $r = qu("SELECT `item`.`id`, `item`.`parent`, `item`.`author-name`, `item`.`author-link`,
-                               `item`.`author-avatar`, `item`.`network`, `item`.`uid`, `item`.`owner-link`, `item`.`body`
-                               FROM `item` WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
-                                       AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = ''
-                                       AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = ''
-                                       AND NOT `item`.`private` AND `item`.`uid` = 0
-                                       AND `item`.`guid` = '%s'", dbesc($a->argv[1]));
+               if (!DBM::is_result($r)) {
+                       $a->error = 404;
+                       notice(t('Item not found.') . EOL);
+                       return;
+               }
+       } elseif (($a->argc == 3) && ($nick == '_feed_')) {
+               $r = dba::fetch_first("SELECT `id`, `parent`, `author-name`, `author-link`,
+                                       `author-avatar`, `network`, `body`, `uid`, `owner-link`
+                       FROM `item` WHERE `visible` AND NOT `deleted` AND NOT `moderated`
+                               AND `allow_cid` = ''  AND `allow_gid` = ''
+                               AND `deny_cid`  = '' AND `deny_gid`  = ''
+                               AND NOT `private` AND `uid` = 0
+                               AND `id` = ? LIMIT 1", $a->argv[2]);
+       }
+
+       if (DBM::is_result($r)) {
+               if (strstr($_SERVER['HTTP_ACCEPT'], 'application/atom+xml')) {
+                       logger('Directly serving XML for id '.$r["id"], LOGGER_DEBUG);
+                       displayShowFeed($r["id"], false);
                }
-               if (dbm::is_result($r)) {
-                       if ($r[0]["id"] != $r[0]["parent"]) {
-                               $r = qu("SELECT `id`, `author-name`, `author-link`, `author-avatar`, `network`, `body`, `uid`, `owner-link` FROM `item`
-                                       WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
-                                               AND `id` = %d", $r[0]["parent"]);
-                       }
-                       if (($itemuid != local_user()) && local_user()) {
-                               // Do we know this contact but we haven't got this item?
-                               // Copy the wohle thread to our local storage so that we can interact.
-                               // We really should change this need for the future since it scales very bad.
-                               $contactid = get_contact($r[0]['owner-link'], local_user());
-                               if ($contactid) {
-                                       $items = qu("SELECT * FROM `item` WHERE `parent` = %d ORDER BY `id`", intval($r[0]["id"]));
-                                       foreach ($items AS $item) {
-                                               $itemcontactid = get_contact($item['owner-link'], local_user());
-                                               if (!$itemcontactid) {
-                                                       $itemcontactid = $contactid;
-                                               }
-                                               unset($item['id']);
-                                               $item['uid'] = local_user();
-                                               $item['origin'] = 0;
-                                               $item['contact-id'] = $itemcontactid;
-                                               $local_copy = item_store($item, false, false, true);
-                                               logger("Stored local copy for post ".$item['guid']." under id ".$local_copy, LOGGER_DEBUG);
-                                       }
-                               }
-                       }
 
-                       $profiledata = display_fetchauthor($a, $r[0]);
-
-                       if (strstr(normalise_link($profiledata["url"]), normalise_link(App::get_baseurl()))) {
-                               $nickname = str_replace(normalise_link(App::get_baseurl())."/profile/", "", normalise_link($profiledata["url"]));
-
-                               if (($nickname != $a->user["nickname"])) {
-                                       $r = qu("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `user`.* FROM `profile`
-                                               INNER JOIN `contact` on `contact`.`uid` = `profile`.`uid` INNER JOIN `user` ON `profile`.`uid` = `user`.`uid`
-                                               WHERE `user`.`nickname` = '%s' AND `profile`.`is-default` AND `contact`.`self` LIMIT 1",
-                                               dbesc($nickname)
-                                       );
-                                       if (dbm::is_result($r)) {
-                                               $profiledata = $r[0];
-                                       }
-                                       $profiledata["network"] = NETWORK_DFRN;
-                               } else {
-                                       $profiledata = array();
+               if ($r["id"] != $r["parent"]) {
+                       $r = dba::fetch_first("SELECT `id`, `author-name`, `author-link`, `author-avatar`, `network`, `body`, `uid`, `owner-link` FROM `item`
+                               WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
+                                       AND `id` = ?", $r["parent"]);
+               }
+
+               $profiledata = display_fetchauthor($a, $r);
+
+               if (strstr(normalise_link($profiledata["url"]), normalise_link(System::baseUrl()))) {
+                       $nickname = str_replace(normalise_link(System::baseUrl())."/profile/", "", normalise_link($profiledata["url"]));
+
+                       if (($nickname != $a->user["nickname"])) {
+                               $r = dba::fetch_first("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `user`.* FROM `profile`
+                                       INNER JOIN `contact` on `contact`.`uid` = `profile`.`uid` INNER JOIN `user` ON `profile`.`uid` = `user`.`uid`
+                                       WHERE `user`.`nickname` = ? AND `profile`.`is-default` AND `contact`.`self` LIMIT 1",
+                                       $nickname
+                               );
+                               if (DBM::is_result($r)) {
+                                       $profiledata = $r;
                                }
+                               $profiledata["network"] = NETWORK_DFRN;
+                       } else {
+                               $profiledata = array();
                        }
-               } else {
-                       $a->error = 404;
-                       notice(t('Item not found.') . EOL);
-                       return;
                }
        }
 
@@ -127,8 +124,6 @@ function display_init(App $a) {
 
 function display_fetchauthor($a, $item) {
 
-       require_once("include/Contact.php");
-
        $profiledata = array();
        $profiledata["uid"] = -1;
        $profiledata["nickname"] = $item["author-name"];
@@ -194,13 +189,13 @@ function display_fetchauthor($a, $item) {
                $profiledata["about"] = "";
        }
 
-       $profiledata = get_contact_details_by_url($profiledata["url"], local_user(), $profiledata);
+       $profiledata = Contact::getDetailsByURL($profiledata["url"], local_user(), $profiledata);
 
-       $profiledata["photo"] = App::remove_baseurl($profiledata["photo"]);
+       $profiledata["photo"] = System::removedBaseUrl($profiledata["photo"]);
 
        if (local_user()) {
                if (in_array($profiledata["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))) {
-                       $profiledata["remoteconnect"] = App::get_baseurl()."/follow?url=".urlencode($profiledata["url"]);
+                       $profiledata["remoteconnect"] = System::baseUrl()."/follow?url=".urlencode($profiledata["url"]);
                }
        } elseif ($profiledata["network"] == NETWORK_DFRN) {
                $connect = str_replace("/profile/", "/dfrn_request/", $profiledata["url"]);
@@ -210,9 +205,9 @@ function display_fetchauthor($a, $item) {
        return($profiledata);
 }
 
-function display_content(App $a, $update = 0) {
+function display_content(App $a, $update = false, $update_uid = 0) {
 
-       if ((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
+       if (Config::get('system','block_public') && !local_user() && !remote_user()) {
                notice(t('Public access denied.') . EOL);
                return;
        }
@@ -232,56 +227,59 @@ function display_content(App $a, $update = 0) {
 
        if ($update) {
                $item_id = $_REQUEST['item_id'];
-               $a->profile = array('uid' => intval($update), 'profile_uid' => intval($update));
+               $item = dba::select('item', ['uid'], ['id' => $item_id], ['limit' => 1]);
+               $a->profile = array('uid' => intval($item['uid']), 'profile_uid' => intval($item['uid']));
        } else {
                $item_id = (($a->argc > 2) ? $a->argv[2] : 0);
 
                if ($a->argc == 2) {
+                       $item_parent = 0;
                        $nick = "";
 
                        if (local_user()) {
-                               $r = qu("SELECT `id` FROM `item`
+                               $r = dba::fetch_first("SELECT `id`, `parent` FROM `item`
                                        WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
-                                               AND `guid` = '%s' AND `uid` = %d", dbesc($a->argv[1]), local_user());
-                               if (dbm::is_result($r)) {
-                                       $item_id = $r[0]["id"];
+                                               AND `guid` = ? AND `uid` = ?", $a->argv[1], local_user());
+                               if (DBM::is_result($r)) {
+                                       $item_id = $r["id"];
+                                       $item_parent = $r["parent"];
                                        $nick = $a->user["nickname"];
                                }
                        }
 
-                       if ($nick == "") {
-                               $r = qu("SELECT `user`.`nickname`, `item`.`id` FROM `item` STRAIGHT_JOIN `user` ON `user`.`uid` = `item`.`uid`
+                       if ($item_parent == 0) {
+                               $r = dba::fetch_first("SELECT `item`.`id`, `item`.`parent` FROM `item`
                                        WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
                                                AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = ''
                                                AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = ''
-                                               AND NOT `item`.`private` AND NOT `user`.`hidewall`
-                                               AND `item`.`guid` = '%s'", dbesc($a->argv[1]));
-                                       //      AND NOT `item`.`private` AND `item`.`wall`
-                               if (dbm::is_result($r)) {
-                                       $item_id = $r[0]["id"];
-                                       $nick = $r[0]["nickname"];
+                                               AND NOT `item`.`private` AND `item`.`uid` = 0
+                                               AND `item`.`guid` = ?", $a->argv[1]);
+                               if (DBM::is_result($r)) {
+                                       $item_id = $r["id"];
+                                       $item_parent = $r["parent"];
                                }
                        }
-                       if ($nick == "") {
-                               $r = qu("SELECT `item`.`id` FROM `item`
+                       if ($item_parent == 0) {
+                               $r = dba::fetch_first("SELECT `user`.`nickname`, `item`.`id`, `item`.`parent` FROM `item` STRAIGHT_JOIN `user` ON `user`.`uid` = `item`.`uid`
                                        WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
                                                AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = ''
                                                AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = ''
-                                               AND NOT `item`.`private` AND `item`.`uid` = 0
-                                               AND `item`.`guid` = '%s'", dbesc($a->argv[1]));
-                                       //      AND NOT `item`.`private` AND `item`.`wall`
-                               if (dbm::is_result($r)) {
-                                       $item_id = $r[0]["id"];
+                                               AND NOT `item`.`private` AND NOT `user`.`hidewall`
+                                               AND `item`.`guid` = ?", $a->argv[1]);
+                               if (DBM::is_result($r)) {
+                                       $item_id = $r["id"];
+                                       $item_parent = $r["parent"];
+                                       $nick = $r["nickname"];
                                }
                        }
                }
        }
 
        if ($item_id && !is_numeric($item_id)) {
-               $r = qu("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
-                       dbesc($item_id), intval($a->profile['uid']));
-               if (dbm::is_result($r)) {
-                       $item_id = $r[0]["id"];
+               $r = dba::select('item', array('id', 'parent'), array('uri' => $item_id, 'uid' => $a->profile['uid']), array('limit' => 1));
+               if (DBM::is_result($r)) {
+                       $item_id = $r["id"];
+                       $item_parent = $r["parent"];
                } else {
                        $item_id = false;
                }
@@ -294,15 +292,22 @@ function display_content(App $a, $update = 0) {
        }
 
        // We are displaying an "alternate" link if that post was public. See issue 2864
-       $items = q("SELECT `id` FROM `item` WHERE `id` = %d AND NOT `private` AND `wall`", intval($item_id));
-       if (dbm::is_result($items)) {
-               $alternate = App::get_baseurl().'/display/'.$nick.'/'.$item_id.'.atom';
+       $is_public = dba::exists('item', array('id' => $item_id, 'private' => false));
+       if ($is_public) {
+               // For the atom feed the nickname doesn't matter at all, we only need the item id.
+               if ($nick == '') {
+                       $nick = '_feed_';
+               }
+               $alternate = System::baseUrl().'/display/'.$nick.'/'.$item_id.'.atom';
+               $conversation = System::baseUrl().'/display/'.$nick.'/'.$item_parent.'/conversation.atom';
        } else {
                $alternate = '';
+               $conversation = '';
        }
 
        $a->page['htmlhead'] .= replace_macros(get_markup_template('display-head.tpl'),
-                               array('$alternate' => $alternate));
+                               array('$alternate' => $alternate,
+                                       '$conversation' => $conversation));
 
        $groups = array();
 
@@ -322,12 +327,12 @@ function display_content(App $a, $update = 0) {
 
        if ($contact_id) {
                $groups = init_groups_visitor($contact_id);
-               $r = qu("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-                       intval($contact_id),
-                       intval($a->profile['uid'])
+               $r = dba::fetch_first("SELECT * FROM `contact` WHERE `id` = ? AND `uid` = ? LIMIT 1",
+                       $contact_id,
+                       $a->profile['uid']
                );
-               if (dbm::is_result($r)) {
-                       $contact = $r[0];
+               if (DBM::is_result($r)) {
+                       $contact = $r;
                        $remote_contact = true;
                }
        }
@@ -339,15 +344,13 @@ function display_content(App $a, $update = 0) {
                }
        }
 
-       $r = qu("SELECT * FROM `contact` WHERE `uid` = %d AND `self` LIMIT 1",
-               intval($a->profile['uid'])
-       );
-       if (dbm::is_result($r)) {
-               $a->page_contact = $r[0];
+       $r = dba::fetch_first("SELECT * FROM `contact` WHERE `uid` = ? AND `self` LIMIT 1", $a->profile['uid']);
+       if (DBM::is_result($r)) {
+               $a->page_contact = $r;
        }
-       $is_owner = ((local_user()) && (local_user() == $a->profile['profile_uid']) ? true : false);
+       $is_owner = (local_user() && (local_user() == $a->profile['profile_uid']) ? true : false);
 
-       if ($a->profile['hidewall'] && (! $is_owner) && (! $remote_contact)) {
+       if ($a->profile['hidewall'] && !$is_owner && !$remote_contact) {
                notice(t('Access to this profile has been restricted.') . EOL);
                return;
        }
@@ -373,77 +376,69 @@ function display_content(App $a, $update = 0) {
        $sql_extra = item_permissions_sql($a->profile['uid'],$remote_contact,$groups);
 
        if ($update) {
-
-               $r = qu("SELECT `id` FROM `item` WHERE `item`.`uid` = %d
-                       AND `item`.`parent` = (SELECT `parent` FROM `item` WHERE `id` = %d)
+               $r = dba::p("SELECT `id` FROM `item` WHERE
+                       `item`.`parent` = (SELECT `parent` FROM `item` WHERE `id` = ?)
                        $sql_extra AND `unseen`",
-                       intval($a->profile['uid']),
-                       intval($item_id)
+                       $item_id
                );
 
-               if (!$r) {
+               if (dba::num_rows($r) == 0) {
                        return '';
                }
        }
 
-       $r = qu(item_query()." AND `item`.`uid` = %d
-               AND `item`.`parent` = (SELECT `parent` FROM `item` WHERE `id` = %d)
+       $r = dba::p(item_query()."AND `item`.`parent` = (SELECT `parent` FROM `item` WHERE `id` = ?)
                $sql_extra
                ORDER BY `parent` DESC, `gravity` ASC, `id` ASC",
-               intval($a->profile['uid']),
-               intval($item_id)
+               $item_id
        );
 
-
-       if (!$r && local_user()) {
+       if (!DBM::is_result($r) && local_user()) {
                // Check if this is another person's link to a post that we have
-               $r = qu("SELECT `item`.uri FROM `item`
-                       WHERE (`item`.`id` = %d OR `item`.`uri` = '%s')
+               $r = dba::fetch_first("SELECT `item`.uri FROM `item`
+                       WHERE (`item`.`id` = ? OR `item`.`uri` = ?)
                        LIMIT 1",
-                       intval($item_id),
-                       dbesc($item_id)
+                       $item_id,
+                       $item_id
                );
-               if (dbm::is_result($r)) {
-                       $item_uri = $r[0]['uri'];
-
-                       $r = qu(item_query()." AND `item`.`uid` = %d
-                               AND `item`.`parent` = (SELECT `parent` FROM `item` WHERE `uri` = '%s' AND uid = %d)
-                               ORDER BY `parent` DESC, `gravity` ASC, `id` ASC ",
-                               intval(local_user()),
-                               dbesc($item_uri),
-                               intval(local_user())
+               if (DBM::is_result($r)) {
+                       $item_uri = $r['uri'];
+
+                       $r = dba::p(item_query()." AND `item`.`uid` = ?
+                               AND `item`.`parent` = (SELECT `parent` FROM `item` WHERE `uri` = ? AND uid = ?)
+                               ORDER BY `parent` DESC, `gravity` ASC, `id` ASC",
+                               local_user(),
+                               $item_uri,
+                               local_user()
                        );
                }
        }
 
-       if ($r) {
+       if (DBM::is_result($r)) {
+               $s = dba::inArray($r);
 
                if ((local_user()) && (local_user() == $a->profile['uid'])) {
-                       $unseen = q("SELECT `id` FROM `item` WHERE `unseen` AND `parent` = %d",
-                                       intval($r[0]['parent']));
-
-                       if ($unseen) {
-                               q("UPDATE `item` SET `unseen` = 0 WHERE `parent` = %d AND `unseen`",
-                                       intval($r[0]['parent'])
-                               );
+                       $unseen = dba::select('item', array('id'), array('parent' => $s[0]['parent'], 'unseen' => true), array('limit' => 1));
+                       if (DBM::is_result($unseen)) {
+                               dba::update('item', array('unseen' => false), array('parent' => $s[0]['parent'], 'unseen' => true));
                        }
                }
 
-               $items = conv_sort($r,"`commented`");
+               $items = conv_sort($s, "`commented`");
 
                if (!$update) {
                        $o .= "<script> var netargs = '?f=&nick=" . $nick . "&item_id=" . $item_id . "'; </script>";
                }
-               $o .= conversation($a,$items,'display', $update);
+               $o .= conversation($a, $items, 'display', $update_uid);
 
                // Preparing the meta header
                require_once('include/bbcode.php');
                require_once("include/html2plain.php");
-               $description = trim(html2plain(bbcode($r[0]["body"], false, false), 0, true));
-               $title = trim(html2plain(bbcode($r[0]["title"], false, false), 0, true));
-               $author_name = $r[0]["author-name"];
+               $description = trim(html2plain(bbcode($s[0]["body"], false, false), 0, true));
+               $title = trim(html2plain(bbcode($s[0]["title"], false, false), 0, true));
+               $author_name = $s[0]["author-name"];
 
-               $image = $a->remove_baseurl($r[0]["author-thumb"]);
+               $image = $a->remove_baseurl($s[0]["author-thumb"]);
 
                if ($title == "") {
                        $title = $author_name;
@@ -474,8 +469,8 @@ function display_content(App $a, $update = 0) {
                $a->page['htmlhead'] .= '<meta name="twitter:card" content="summary" />'."\n";
                $a->page['htmlhead'] .= '<meta name="twitter:title" content="'.$title.'" />'."\n";
                $a->page['htmlhead'] .= '<meta name="twitter:description" content="'.$description.'" />'."\n";
-               $a->page['htmlhead'] .= '<meta name="twitter:image" content="'.$image.'" />'."\n";
-               $a->page['htmlhead'] .= '<meta name="twitter:url" content="'.$r[0]["plink"].'" />'."\n";
+               $a->page['htmlhead'] .= '<meta name="twitter:image" content="'.System::baseUrl().'/'.$image.'" />'."\n";
+               $a->page['htmlhead'] .= '<meta name="twitter:url" content="'.$s[0]["plink"].'" />'."\n";
 
                // Dublin Core
                $a->page['htmlhead'] .= '<meta name="DC.title" content="'.$title.'" />'."\n";
@@ -484,29 +479,37 @@ function display_content(App $a, $update = 0) {
                // Open Graph
                $a->page['htmlhead'] .= '<meta property="og:type" content="website" />'."\n";
                $a->page['htmlhead'] .= '<meta property="og:title" content="'.$title.'" />'."\n";
-               $a->page['htmlhead'] .= '<meta property="og:image" content="'.$image.'" />'."\n";
-               $a->page['htmlhead'] .= '<meta property="og:url" content="'.$r[0]["plink"].'" />'."\n";
+               $a->page['htmlhead'] .= '<meta property="og:image" content="'.System::baseUrl().'/'.$image.'" />'."\n";
+               $a->page['htmlhead'] .= '<meta property="og:url" content="'.$s[0]["plink"].'" />'."\n";
                $a->page['htmlhead'] .= '<meta property="og:description" content="'.$description.'" />'."\n";
                $a->page['htmlhead'] .= '<meta name="og:article:author" content="'.$author_name.'" />'."\n";
                // article:tag
 
                return $o;
        }
-
-       $r = qu("SELECT `id`,`deleted` FROM `item` WHERE `id` = '%s' OR `uri` = '%s' LIMIT 1",
-               dbesc($item_id),
-               dbesc($item_id)
+       $r = dba::fetch_first("SELECT `id`,`deleted` FROM `item` WHERE `id` = ? OR `uri` = ? LIMIT 1",
+               $item_id,
+               $item_id
        );
-       if ($r) {
-               if ($r[0]['deleted']) {
-                       notice(t('Item has been removed.') . EOL );
+       if (DBM::is_result($r)) {
+               if ($r['deleted']) {
+                       notice(t('Item has been removed.') . EOL);
                } else {
-                       notice(t('Permission denied.') . EOL );
+                       notice(t('Permission denied.') . EOL);
                }
        } else {
-               notice(t('Item not found.') . EOL );
+               notice(t('Item not found.') . EOL);
        }
 
        return $o;
 }
 
+function displayShowFeed($item_id, $conversation) {
+       $xml = DFRN::itemFeed($item_id, $conversation);
+       if ($xml == '') {
+               http_status_exit(500);
+       }
+       header("Content-type: application/atom+xml");
+       echo $xml;
+       killme();
+}