X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdisplay.php;h=b76fe1d483df8020cf53c178dd659da11d4162c0;hb=5ab697e7264d2609e764723f708b647349f2004f;hp=e53f9e20669d7ed70b93b579f85305494861abb0;hpb=a4dd0b835c90c5dcd611a39354370cb3f860c7d7;p=friendica.git diff --git a/mod/display.php b/mod/display.php index e53f9e2066..b76fe1d483 100644 --- a/mod/display.php +++ b/mod/display.php @@ -1,14 +1,32 @@ argc > 1) ? $a->argv[1] : ''); $profiledata = array(); + 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(); + } + } + // If there is only one parameter, then check if this parameter could be a guid if ($a->argc == 2) { $nick = ""; @@ -16,10 +34,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` + $r = dba::fetch_first("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)) { + AND `guid` = ? AND `uid` = ? LIMIT 1", $a->argv[1], local_user()); + if (dbm::is_result($r)) { $nick = $a->user["nickname"]; $itemuid = local_user(); } @@ -27,69 +45,92 @@ 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` + $r = dba::fetch_first("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 NOT `item`.`private` AND NOT `user`.`hidewall` - AND `item`.`guid` = '%s'", dbesc($a->argv[1])); - // AND NOT `item`.`private` AND `item`.`wall` - if (count($r)) { - $nick = $r[0]["nickname"]; - $itemuid = $r[0]["uid"]; + AND `item`.`guid` = ? LIMIT 1", $a->argv[1]); + if (dbm::is_result($r)) { + $nick = $r["nickname"]; + $itemuid = $r["uid"]; } } // 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` + $r = dba::fetch_first("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])); - // AND NOT `item`.`private` AND `item`.`wall` + AND `item`.`guid` = ? LIMIT 1", $a->argv[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` + if (dbm::is_result($r)) { + 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` = %d", $r[0]["parent"]); + AND `id` = ?", $r["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['owner-link'], local_user()); + if ($contactid) { + $items = dba::select('item', array(), array('parent' => $r["id"]), array('order' => array('id'))); + while ($item = dba::fetch($items)) { + $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); + } + dba::close($items); + } + } - $profiledata = display_fetchauthor($a, $r[0]); + $profiledata = display_fetchauthor($a, $r); - 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(System::baseUrl()))) { + $nickname = str_replace(normalise_link(System::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 = 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` = '%s' AND `profile`.`is-default` AND `contact`.`self` LIMIT 1", - dbesc($nickname) + WHERE `user`.`nickname` = ? AND `profile`.`is-default` AND `contact`.`self` LIMIT 1", + $nickname ); - if (count($r)) - $profiledata = $r[0]; - + if (dbm::is_result($r)) { + $profiledata = $r; + } $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); - } function display_fetchauthor($a, $item) { + require_once("include/Contact.php"); + $profiledata = array(); $profiledata["uid"] = -1; $profiledata["nickname"] = $item["author-name"]; @@ -105,48 +146,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 && strpos($body, "[share") > 0) { $skip = true; - + } // Does it end with a share? - if (!$skip AND (strlen($body) > (strrpos($body, "[/share]") + 8))) + if (!$skip && (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] != "") + if ($matches[1] != "") { $profiledata["name"] = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8'); - + } preg_match('/author="(.*?)"/ism', $attributes, $matches); - if ($matches[1] != "") + if ($matches[1] != "") { $profiledata["name"] = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8'); - + } $profile = ""; preg_match("/profile='(.*?)'/ism", $attributes, $matches); - if ($matches[1] != "") + if ($matches[1] != "") { $profiledata["url"] = $matches[1]; - + } preg_match('/profile="(.*?)"/ism', $attributes, $matches); - if ($matches[1] != "") + if ($matches[1] != "") { $profiledata["url"] = $matches[1]; - + } $avatar = ""; preg_match("/avatar='(.*?)'/ism", $attributes, $matches); - if ($matches[1] != "") + 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); @@ -154,65 +196,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"]; - - 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"]; + $profiledata = get_contact_details_by_url($profiledata["url"], local_user(), $profiledata); - if ($r[0]["gender"]) - $profiledata["gender"] = $r[0]["gender"]; - } - } - } + $profiledata["photo"] = System::removedBaseUrl($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"] = System::baseUrl()."/follow?url=".urlencode($profiledata["url"]); + } } elseif ($profiledata["network"] == NETWORK_DFRN) { $connect = str_replace("/profile/", "/dfrn_request/", $profiledata["url"]); $profiledata["remoteconnect"] = $connect; @@ -221,10 +212,10 @@ function display_fetchauthor($a, $item) { return($profiledata); } -function display_content(&$a, $update = 0) { +function display_content(App $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; } @@ -235,71 +226,64 @@ function display_content(&$a, $update = 0) { $o = ''; - $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` + $r = dba::fetch_first("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)) { - $item_id = $r[0]["id"]; + AND `guid` = ? AND `uid` = ?", $a->argv[1], local_user()); + if (dbm::is_result($r)) { + $item_id = $r["id"]; $nick = $a->user["nickname"]; } } if ($nick == "") { - $r = q("SELECT `user`.`nickname`, `item`.`id` FROM `item` INNER JOIN `user` ON `user`.`uid` = `item`.`uid` + $r = dba::fetch_first("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 NOT `item`.`private` AND NOT `user`.`hidewall` - AND `item`.`guid` = '%s'", dbesc($a->argv[1])); - // AND NOT `item`.`private` AND `item`.`wall` - if (count($r)) { - $item_id = $r[0]["id"]; - $nick = $r[0]["nickname"]; + AND `item`.`guid` = ?", $a->argv[1]); + if (dbm::is_result($r)) { + $item_id = $r["id"]; + $nick = $r["nickname"]; } } if ($nick == "") { - $r = q("SELECT `item`.`id` FROM `item` + $r = dba::fetch_first("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 NOT `item`.`private` AND `item`.`uid` = 0 - AND `item`.`guid` = '%s'", dbesc($a->argv[1])); - // AND NOT `item`.`private` AND `item`.`wall` - if (count($r)) { - $item_id = $r[0]["id"]; + AND `item`.`guid` = ?", $a->argv[1]); + if (dbm::is_result($r)) { + $item_id = $r["id"]; } } } } - if ($item_id AND !is_numeric($item_id)) { - $r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", - dbesc($item_id), intval($a->profile['uid'])); - if ($r) - $item_id = $r[0]["id"]; - else + if ($item_id && !is_numeric($item_id)) { + $r = dba::select('item', array('id'), array('uri' => $item_id, 'uid' => $a->profile['uid']), array('limit' => 1)); + if (dbm::is_result($r)) { + $item_id = $r["id"]; + } else { $item_id = false; + } } if (!$item_id) { @@ -308,6 +292,16 @@ function display_content(&$a, $update = 0) { return; } + // We are displaying an "alternate" link if that post was public. See issue 2864 + $is_public = dba::exists('item', array('id' => $item_id, 'private' => false, 'wall' => true)); + if ($is_public) { + $alternate = System::baseUrl().'/display/'.$nick.'/'.$item_id.'.atom'; + } else { + $alternate = ''; + } + + $a->page['htmlhead'] .= replace_macros(get_markup_template('display-head.tpl'), + array('$alternate' => $alternate)); $groups = array(); @@ -316,44 +310,42 @@ 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", - 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(count($r)) { - $contact = $r[0]; + if (dbm::is_result($r)) { + $contact = $r; $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` LIMIT 1", - intval($a->profile['uid']) - ); - if(count($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); - 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; } @@ -377,91 +369,82 @@ function display_content(&$a, $update = 0) { $sql_extra = item_permissions_sql($a->profile['uid'],$remote_contact,$groups); - if($update) { - - $r = q("SELECT `id` FROM `item` WHERE `item`.`uid` = %d - AND `item`.`parent` = (SELECT `parent` FROM `item` WHERE `id` = %d) + if ($update) { + $r = dba::p("SELECT `id` FROM `item` WHERE `item`.`uid` = ? + AND `item`.`parent` = (SELECT `parent` FROM `item` WHERE `id` = ?) $sql_extra AND `unseen`", - intval($a->profile['uid']), - intval($item_id) + $a->profile['uid'], + $item_id ); - if(!$r) + if (dba::num_rows($r) == 0) { return ''; + } } - $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 NOT `contact`.`blocked` AND NOT `contact`.`pending` - WHERE `item`.`uid` = %d AND `item`.`visible` AND NOT `item`.`deleted` - AND NOT `item`.`moderated` - AND `item`.`parent` = (SELECT `parent` FROM `item` WHERE `id` = %d) + $r = dba::p(item_query()." AND `item`.`uid` = ? + 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) + $a->profile['uid'], + $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 = q("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($r) { - $item_uri = $r[0]['uri']; - - $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 NOT `contact`.`blocked` AND NOT `contact`.`pending` - WHERE `item`.`uid` = %d AND `item`.`visible` AND NOT `item`.`deleted` - AND NOT `item`.`moderated` - 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 (dbm::is_result($r)) { + $s = dba::inArray($r); - if($r) { - - if((local_user()) && (local_user() == $a->profile['uid'])) { - q("UPDATE `item` SET `unseen` = 0 - WHERE `parent` = %d AND `unseen`", - intval($r[0]['parent']) - ); + if ((local_user()) && (local_user() == $a->profile['uid'])) { + $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) + if (!$update) { $o .= ""; - $o .= conversation($a,$items,'display', $update); + } + $o .= conversation($a, $items, 'display', $update); // 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 = ""; - if ($image == "") - $image = $r[0]["thumb"]; + $image = $a->remove_baseurl($s[0]["author-thumb"]); - if ($title == "") + if ($title == "") { $title = $author_name; + } + + // Limit the description to 160 characters + if (strlen($description) > 160) { + $description = substr($description, 0, 157) . '...'; + } $description = htmlspecialchars($description, ENT_COMPAT, 'UTF-8', true); // allow double encoding here $title = htmlspecialchars($title, ENT_COMPAT, 'UTF-8', true); // allow double encoding here @@ -484,7 +467,7 @@ function display_content(&$a, $update = 0) { $a->page['htmlhead'] .= ''."\n"; $a->page['htmlhead'] .= ''."\n"; $a->page['htmlhead'] .= ''."\n"; - $a->page['htmlhead'] .= ''."\n"; + $a->page['htmlhead'] .= ''."\n"; // Dublin Core $a->page['htmlhead'] .= ''."\n"; @@ -494,7 +477,7 @@ function display_content(&$a, $update = 0) { $a->page['htmlhead'] .= ''."\n"; $a->page['htmlhead'] .= ''."\n"; $a->page['htmlhead'] .= ''."\n"; - $a->page['htmlhead'] .= ''."\n"; + $a->page['htmlhead'] .= ''."\n"; $a->page['htmlhead'] .= ''."\n"; $a->page['htmlhead'] .= ''."\n"; // article:tag @@ -502,20 +485,18 @@ function display_content(&$a, $update = 0) { return $o; } - $r = q("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 ); - } - else { - notice( t('Permission denied.') . EOL ); + if ($r) { + if ($r['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;