]> git.mxchange.org Git - friendica.git/blobdiff - mod/display.php
Merge remote-tracking branch 'upstream/develop' into 1612-unused-indexes
[friendica.git] / mod / display.php
index 9995a2b3efc2c0e0587a37d0dd2d1ca05b3c81e7..c98d936a0f45dd6c01676709d7cf88947406b59c 100644 (file)
@@ -1,8 +1,8 @@
 <?php
-if(! function_exists('display_init')) {
-function display_init(&$a) {
 
-       if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
+function display_init(App &$a) {
+
+       if ((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
                return;
        }
 
@@ -16,10 +16,10 @@ function display_init(&$a) {
 
                // Does the local user have this item?
                if (local_user()) {
-                       $r = q("SELECT `id`, `parent`, `author-name`, `author-link`, `author-avatar`, `network`, `body`, `uid` FROM `item`
-                               WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
+                       $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 (count($r)) {
+                       if (dbm::is_result($r)) {
                                $nick = $a->user["nickname"];
                                $itemuid = local_user();
                        }
@@ -27,16 +27,15 @@ function display_init(&$a) {
 
                // Or is it anywhere on the server?
                if ($nick == "") {
-                       $r = q("SELECT `user`.`nickname`, `item`.`id`, `item`.`parent`, `item`.`author-name`,
-                               `item`.`author-link`, `item`.`author-avatar`, `item`.`network`, `item`.`uid`, `item`.`body`
-                               FROM `item` INNER JOIN `user` ON `user`.`uid` = `item`.`uid`
-                               WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
+                       $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`
+                               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 `item`.`private` = 0 AND NOT `user`.`hidewall`
+                                       AND NOT `item`.`private` AND NOT `user`.`hidewall`
                                        AND `item`.`guid` = '%s'", dbesc($a->argv[1]));
-                               //      AND `item`.`private` = 0 AND `item`.`wall` = 1
-                       if (count($r)) {
+                       if (dbm::is_result($r)) {
                                $nick = $r[0]["nickname"];
                                $itemuid = $r[0]["uid"];
                        }
@@ -44,53 +43,76 @@ function display_init(&$a) {
 
                // Is it an item with uid=0?
                if ($nick == "") {
-                       $r = q("SELECT `item`.`id`, `item`.`parent`, `item`.`author-name`,
-                               `item`.`author-link`, `item`.`author-avatar`, `item`.`network`, `item`.`uid`, `item`.`body`
-                               FROM `item` WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
+                       $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 `item`.`private` = 0 AND `item`.`uid` = 0
+                                       AND NOT `item`.`private` AND `item`.`uid` = 0
                                        AND `item`.`guid` = '%s'", dbesc($a->argv[1]));
-                               //      AND `item`.`private` = 0 AND `item`.`wall` = 1
                }
-               if (count($r)) {
-                       if ($r[0]["id"] != $r[0]["parent"])
-                               $r = q("SELECT `id`, `author-name`, `author-link`, `author-avatar`, `network`, `body`, `uid` FROM `item`
-                                       WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
+               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()) AND 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($a->get_baseurl()))) {
-                               $nickname = str_replace(normalise_link($a->get_baseurl())."/profile/", "", normalise_link($profiledata["url"]));
+                       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 = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `user`.* FROM `profile`
+                                       $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` = 1 and `contact`.`self` = 1 LIMIT 1",
+                                               WHERE `user`.`nickname` = '%s' AND `profile`.`is-default` AND `contact`.`self` LIMIT 1",
                                                dbesc($nickname)
                                        );
-                                       if (count($r))
+                                       if (dbm::is_result($r)) {
                                                $profiledata = $r[0];
-
+                                       }
                                        $profiledata["network"] = NETWORK_DFRN;
-                               } else
+                               } else {
                                        $profiledata = array();
+                               }
                        }
                } else {
                        $a->error = 404;
-                       notice( t('Item not found.') . EOL);
+                       notice(t('Item not found.') . EOL);
                        return;
                }
        }
 
        profile_load($a, $nick, 0, $profiledata);
-}
+
 }
 
-if(! function_exists('display_fetchauthor')) {
 function display_fetchauthor($a, $item) {
 
+       require_once("include/Contact.php");
+
        $profiledata = array();
        $profiledata["uid"] = -1;
        $profiledata["nickname"] = $item["author-name"];
@@ -106,48 +128,49 @@ function display_fetchauthor($a, $item) {
 
        // Skip if it isn't a pure repeated messages
        // Does it start with a share?
-       if (!$skip AND strpos($body, "[share") > 0)
+       if (!$skip AND strpos($body, "[share") > 0) {
                $skip = true;
-
+       }
        // Does it end with a share?
-       if (!$skip AND (strlen($body) > (strrpos($body, "[/share]") + 8)))
+       if (!$skip AND (strlen($body) > (strrpos($body, "[/share]") + 8))) {
                $skip = true;
-
+       }
        if (!$skip) {
                $attributes = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","$1",$body);
                // Skip if there is no shared message in there
-               if ($body == $attributes)
+               if ($body == $attributes) {
                        $skip = true;
+               }
        }
 
        if (!$skip) {
-               $author = "";
-               preg_match("/author='(.*?)'/ism", $attributes, $matches);
-               if ($matches[1] != "")
+               $author = "";
+               preg_match("/author='(.*?)'/ism", $attributes, $matches);
+               if ($matches[1] != "") {
                        $profiledata["name"] = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8');
-
-               preg_match('/author="(.*?)"/ism', $attributes, $matches);
-               if ($matches[1] != "")
+               }
+               preg_match('/author="(.*?)"/ism', $attributes, $matches);
+               if ($matches[1] != "") {
                        $profiledata["name"] = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8');
-
-               $profile = "";
-               preg_match("/profile='(.*?)'/ism", $attributes, $matches);
-               if ($matches[1] != "")
+               }
+               $profile = "";
+               preg_match("/profile='(.*?)'/ism", $attributes, $matches);
+               if ($matches[1] != "") {
                        $profiledata["url"] = $matches[1];
-
-               preg_match('/profile="(.*?)"/ism', $attributes, $matches);
-               if ($matches[1] != "")
+               }
+               preg_match('/profile="(.*?)"/ism', $attributes, $matches);
+               if ($matches[1] != "") {
                        $profiledata["url"] = $matches[1];
-
-               $avatar = "";
-               preg_match("/avatar='(.*?)'/ism", $attributes, $matches);
-               if ($matches[1] != "")
+               }
+               $avatar = "";
+               preg_match("/avatar='(.*?)'/ism", $attributes, $matches);
+               if ($matches[1] != "") {
                        $profiledata["photo"] = $matches[1];
-
+               }
                preg_match('/avatar="(.*?)"/ism', $attributes, $matches);
-               if ($matches[1] != "")
+               if ($matches[1] != "") {
                        $profiledata["photo"] = $matches[1];
-
+               }
                $profiledata["nickname"] = $profiledata["name"];
                $profiledata["network"] = GetProfileUsername($profiledata["url"], "", false, true);
 
@@ -155,65 +178,14 @@ function display_fetchauthor($a, $item) {
                $profiledata["about"] = "";
        }
 
-       // Don't show details from Diaspora contacts if you don't follow the contact
-       $showdetails = ($profiledata["network"] != NETWORK_DIASPORA);
-
-       // Fetching further contact data from the contact table
-       $r = q("SELECT `uid`, `network`, `name`, `photo`, `nick`, `addr`, `location`, `about`, `gender`, `keywords`
-               FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d AND `network` = '%s' AND `rel` IN (%d, %d)",
-               dbesc(normalise_link($profiledata["url"])), intval(local_user()), dbesc($item["network"]),
-               intval(CONTACT_IS_SHARING), intval(CONTACT_IS_FRIEND));
-       if (!count($r))
-               $r = q("SELECT `uid`, `network`, `name`, `photo`, `nick`, `addr`, `location`, `about`, `gender`, `keywords`
-                       FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d AND `rel` IN (%d, %d)",
-                       dbesc(normalise_link($profiledata["url"])), intval(local_user()),
-                       intval(CONTACT_IS_SHARING), intval(CONTACT_IS_FRIEND));
-
-       if (count($r)) {
-               $profiledata["name"] = $r[0]["name"];
-               $profiledata["photo"] = $r[0]["photo"];
-               $profiledata["nickname"] = $r[0]["nick"];
-               $profiledata["addr"] = $r[0]["addr"];
-               $profiledata["keywords"] = $r[0]["keywords"];
-               $profiledata["network"] = $r[0]["network"];
-
-               if (local_user() OR $showdetails) {
-                       $showdetails = true;
-                       $profiledata["address"] = $r[0]["location"];
-                       $profiledata["about"] = $r[0]["about"];
-                       $profiledata["gender"] = $r[0]["gender"];
-               }
-       }
-
-       // Fetching profile data from global contacts
-       if ($profiledata["network"] != NETWORK_FEED) {
-               $r = q("SELECT `name`, `photo`, `nick`, `addr`, `location`, `about`, `gender`, `keywords`, `network` FROM `gcontact` WHERE `nurl` = '%s'", dbesc(normalise_link($profiledata["url"])));
-               if (count($r)) {
-                       $profiledata["name"] = $r[0]["name"];
-                       $profiledata["photo"] = $r[0]["photo"];
-                       $profiledata["nickname"] = $r[0]["nick"];
-                       $profiledata["addr"] = $r[0]["addr"];
-                       $profiledata["network"] = $r[0]["network"];
+       $profiledata = get_contact_details_by_url($profiledata["url"], local_user(), $profiledata);
 
-                       if ($r[0]["keywords"])
-                               $profiledata["keywords"] = $r[0]["keywords"];
-
-                       if ($showdetails) {
-                               if ($r[0]["location"])
-                                       $profiledata["address"] = $r[0]["location"];
-
-                               if ($r[0]["about"])
-                                       $profiledata["about"] = $r[0]["about"];
-
-                               if ($r[0]["gender"])
-                                       $profiledata["gender"] = $r[0]["gender"];
-                       }
-               }
-       }
+       $profiledata["photo"] = App::remove_baseurl($profiledata["photo"]);
 
        if (local_user()) {
-               if (in_array($profiledata["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS)))
-                       $profiledata["remoteconnect"] = $a->get_baseurl()."/follow?url=".urlencode($profiledata["url"]);
+               if (in_array($profiledata["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))) {
+                       $profiledata["remoteconnect"] = App::get_baseurl()."/follow?url=".urlencode($profiledata["url"]);
+               }
        } elseif ($profiledata["network"] == NETWORK_DFRN) {
                $connect = str_replace("/profile/", "/dfrn_request/", $profiledata["url"]);
                $profiledata["remoteconnect"] = $connect;
@@ -221,13 +193,11 @@ function display_fetchauthor($a, $item) {
 
        return($profiledata);
 }
-}
 
-if(! function_exists('display_content')) {
 function display_content(&$a, $update = 0) {
 
-       if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
-               notice( t('Public access denied.') . EOL);
+       if ((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
+               notice(t('Public access denied.') . EOL);
                return;
        }
 
@@ -241,67 +211,76 @@ function display_content(&$a, $update = 0) {
        $a->page['htmlhead'] .= replace_macros(get_markup_template('display-head.tpl'), array());
 
 
-       if($update) {
+       if ($update) {
                $nick = $_REQUEST['nick'];
-       }
-       else {
+       } else {
                $nick = (($a->argc > 1) ? $a->argv[1] : '');
        }
 
-       if($update) {
+       if ($update) {
                $item_id = $_REQUEST['item_id'];
                $a->profile = array('uid' => intval($update), 'profile_uid' => intval($update));
-       }
-       else {
+       } else {
                $item_id = (($a->argc > 2) ? $a->argv[2] : 0);
 
                if ($a->argc == 2) {
                        $nick = "";
 
                        if (local_user()) {
-                               $r = q("SELECT `id` FROM `item`
-                                       WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
+                               $r = qu("SELECT `id` 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 (count($r)) {
+                               if (dbm::is_result($r)) {
                                        $item_id = $r[0]["id"];
                                        $nick = $a->user["nickname"];
                                }
                        }
 
                        if ($nick == "") {
-                               $r = q("SELECT `user`.`nickname`, `item`.`id` FROM `item` INNER JOIN `user` ON `user`.`uid` = `item`.`uid`
-                                       WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
+                               $r = qu("SELECT `user`.`nickname`, `item`.`id` 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 `item`.`private` = 0  AND NOT `user`.`hidewall`
+                                               AND NOT `item`.`private` AND NOT `user`.`hidewall`
                                                AND `item`.`guid` = '%s'", dbesc($a->argv[1]));
-                                       //      AND `item`.`private` = 0 AND `item`.`wall` = 1
-                               if (count($r)) {
+                                       //      AND NOT `item`.`private` AND `item`.`wall`
+                               if (dbm::is_result($r)) {
                                        $item_id = $r[0]["id"];
                                        $nick = $r[0]["nickname"];
                                }
                        }
                        if ($nick == "") {
-                               $r = q("SELECT `item`.`id` FROM `item`
-                                       WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
+                               $r = qu("SELECT `item`.`id` 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 `item`.`private` = 0  AND `item`.`uid` = 0
+                                               AND NOT `item`.`private` AND `item`.`uid` = 0
                                                AND `item`.`guid` = '%s'", dbesc($a->argv[1]));
-                                       //      AND `item`.`private` = 0 AND `item`.`wall` = 1
-                               if (count($r)) {
+                                       //      AND NOT `item`.`private` AND `item`.`wall`
+                               if (dbm::is_result($r)) {
                                        $item_id = $r[0]["id"];
                                }
                        }
                }
        }
 
-       if(! $item_id) {
+       if ($item_id AND !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"];
+               } else {
+                       $item_id = false;
+               }
+       }
+
+       if (!$item_id) {
                $a->error = 404;
-               notice( t('Item not found.') . EOL);
+               notice(t('Item not found.').EOL);
                return;
        }
 
+
        $groups = array();
 
        $contact = null;
@@ -309,51 +288,49 @@ function display_content(&$a, $update = 0) {
 
        $contact_id = 0;
 
-       if(is_array($_SESSION['remote'])) {
-               foreach($_SESSION['remote'] as $v) {
-                       if($v['uid'] == $a->profile['uid']) {
+       if (is_array($_SESSION['remote'])) {
+               foreach ($_SESSION['remote'] as $v) {
+                       if ($v['uid'] == $a->profile['uid']) {
                                $contact_id = $v['cid'];
                                break;
                        }
                }
        }
 
-       if($contact_id) {
+       if ($contact_id) {
                $groups = init_groups_visitor($contact_id);
-               $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+               $r = qu("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
                        intval($contact_id),
                        intval($a->profile['uid'])
                );
-               if(count($r)) {
+               if (dbm::is_result($r)) {
                        $contact = $r[0];
                        $remote_contact = true;
                }
        }
 
-       if(! $remote_contact) {
-               if(local_user()) {
+       if (!$remote_contact) {
+               if (local_user()) {
                        $contact_id = $_SESSION['cid'];
                        $contact = $a->contact;
                }
        }
 
-       $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
+       $r = qu("SELECT * FROM `contact` WHERE `uid` = %d AND `self` LIMIT 1",
                intval($a->profile['uid'])
        );
-       if(count($r))
+       if (dbm::is_result($r)) {
                $a->page_contact = $r[0];
-
+       }
        $is_owner = ((local_user()) && (local_user() == $a->profile['profile_uid']) ? true : false);
 
-       if($a->profile['hidewall'] && (! $is_owner) && (! $remote_contact)) {
-               notice( t('Access to this profile has been restricted.') . EOL);
+       if ($a->profile['hidewall'] && (! $is_owner) && (! $remote_contact)) {
+               notice(t('Access to this profile has been restricted.') . EOL);
                return;
        }
 
-       // Why do we need this on the display page? We don't have the possibility to write new content here.
-       // Ad editing of posts work without this as well.
-       // We should remove this completely for the 3.5.1 release.
-       /*
+       // We need the editor here to be able to reshare an item.
+
        if ($is_owner) {
                $x = array(
                        'is_owner' => true,
@@ -369,66 +346,44 @@ function display_content(&$a, $update = 0) {
                );
                $o .= status_editor($a,$x,0,true);
        }
-       */
 
        $sql_extra = item_permissions_sql($a->profile['uid'],$remote_contact,$groups);
 
-       //              AND `item`.`parent` = ( SELECT `parent` FROM `item` FORCE INDEX (PRIMARY, `uri`) WHERE ( `id` = '%s' OR `uri` = '%s' ))
-
-       if($update) {
+       if ($update) {
 
-               $r = q("SELECT id FROM item WHERE item.uid = %d
-                       AND `item`.`parent` = (SELECT `parent` FROM `item` WHERE (`id` = '%s' OR `uri` = '%s'))
-                       $sql_extra AND unseen = 1",
-                       intval($a->profile['uid']),
-                       dbesc($item_id),
-                       dbesc($item_id)
+               $r = qu("SELECT `id` FROM `item` WHERE `item`.`uid` = %d
+                       AND `item`.`parent` = (SELECT `parent` FROM `item` WHERE `id` = %d)
+                       $sql_extra AND `unseen`",
+                       intval($a->profile['uid']),
+                       intval($item_id)
                );
 
-               if(!$r)
+               if (!$r) {
                        return '';
+               }
        }
 
-       //      AND `item`.`parent` = ( SELECT `parent` FROM `item` FORCE INDEX (PRIMARY, `uri`) WHERE ( `id` = '%s' OR `uri` = '%s' )
-
-       $r = q("SELECT `item`.*, `item`.`id` AS `item_id`,  `item`.`network` AS `item_network`,
-               `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
-               `contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`,
-               `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
-               FROM `item` INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
-               AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
-               WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
-               and `item`.`moderated` = 0
-               AND `item`.`parent` = (SELECT `parent` FROM `item` WHERE (`id` = '%s' OR `uri` = '%s')
-               AND uid = %d)
+       $r = qu(item_query()." AND `item`.`uid` = %d
+               AND `item`.`parent` = (SELECT `parent` FROM `item` WHERE `id` = %d)
                $sql_extra
                ORDER BY `parent` DESC, `gravity` ASC, `id` ASC",
                intval($a->profile['uid']),
-               dbesc($item_id),
-               dbesc($item_id),
-               intval($a->profile['uid'])
+               intval($item_id)
        );
 
-       if(!$r && local_user()) {
+
+       if (!$r && local_user()) {
                // Check if this is another person's link to a post that we have
-               $r = q("SELECT `item`.uri FROM `item`
-                       WHERE (`item`.`id` = '%s' OR `item`.`uri` = '%s' )
+               $r = qu("SELECT `item`.uri FROM `item`
+                       WHERE (`item`.`id` = %d OR `item`.`uri` = '%s')
                        LIMIT 1",
-                       dbesc($item_id),
+                       intval($item_id),
                        dbesc($item_id)
                );
-               if($r) {
+               if (dbm::is_result($r)) {
                        $item_uri = $r[0]['uri'];
-                       //      AND `item`.`parent` = ( SELECT `parent` FROM `item` FORCE INDEX (PRIMARY, `uri`) WHERE `uri` = '%s' AND uid = %d )
-
-                       $r = q("SELECT `item`.*, `item`.`id` AS `item_id`,  `item`.`network` AS `item_network`,
-                               `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
-                               `contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`,
-                               `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
-                               FROM `item` INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
-                               AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
-                               WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
-                               and `item`.`moderated` = 0
+
+                       $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()),
@@ -438,20 +393,24 @@ function display_content(&$a, $update = 0) {
                }
        }
 
+       if ($r) {
 
-       if($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((local_user()) && (local_user() == $a->profile['uid'])) {
-                       q("UPDATE `item` SET `unseen` = 0
-                               WHERE `parent` = %d AND `unseen` = 1",
-                               intval($r[0]['parent'])
-                       );
+                       if ($unseen) {
+                               q("UPDATE `item` SET `unseen` = 0 WHERE `parent` = %d AND `unseen`",
+                                       intval($r[0]['parent'])
+                               );
+                       }
                }
 
                $items = conv_sort($r,"`commented`");
 
-               if(!$update)
+               if (!$update) {
                        $o .= "<script> var netargs = '?f=&nick=" . $nick . "&item_id=" . $item_id . "'; </script>";
+               }
                $o .= conversation($a,$items,'display', $update);
 
                // Preparing the meta header
@@ -461,13 +420,11 @@ function display_content(&$a, $update = 0) {
                $title = trim(html2plain(bbcode($r[0]["title"], false, false), 0, true));
                $author_name = $r[0]["author-name"];
 
-               $image = "";
-               if ($image == "")
-                       $image = $r[0]["thumb"];
+               $image = $a->remove_baseurl($r[0]["thumb"]);
 
-               if ($title == "")
+               if ($title == "") {
                        $title = $author_name;
-
+               }
                $description = htmlspecialchars($description, ENT_COMPAT, 'UTF-8', true); // allow double encoding here
                $title = htmlspecialchars($title, ENT_COMPAT, 'UTF-8', true); // allow double encoding here
                $author_name = htmlspecialchars($author_name, ENT_COMPAT, 'UTF-8', true); // allow double encoding here
@@ -507,22 +464,20 @@ function display_content(&$a, $update = 0) {
                return $o;
        }
 
-       $r = q("SELECT `id`,`deleted` FROM `item` WHERE `id` = '%s' OR `uri` = '%s' LIMIT 1",
+       $r = qu("SELECT `id`,`deleted` FROM `item` WHERE `id` = '%s' OR `uri` = '%s' LIMIT 1",
                dbesc($item_id),
                dbesc($item_id)
        );
-       if($r) {
-               if($r[0]['deleted']) {
-                       notice( t('Item has been removed.') . EOL );
-               }
-               else {
-                       notice( t('Permission denied.') . EOL );
+       if ($r) {
+               if ($r[0]['deleted']) {
+                       notice(t('Item has been removed.') . EOL );
+               } else {
+                       notice(t('Permission denied.') . EOL );
                }
-       }
-       else {
-               notice( t('Item not found.') . EOL );
+       } else {
+               notice(t('Item not found.') . EOL );
        }
 
        return $o;
 }
-}
+