From: Michael Date: Thu, 21 Dec 2017 08:58:36 +0000 (+0000) Subject: Removed unneeded code X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=fba40b8761fae4455da1eccb369ac76784c668fa;p=friendica.git Removed unneeded code --- diff --git a/mod/display.php b/mod/display.php index 094fb30c78..31b6a13538 100644 --- a/mod/display.php +++ b/mod/display.php @@ -8,8 +8,7 @@ use Friendica\Model\Contact; use Friendica\Protocol\DFRN; function display_init(App $a) { - - if ((Config::get('system','block_public')) && (! local_user()) && (! remote_user())) { + if (Config::get('system','block_public') && !local_user() && !remote_user()) { return; } @@ -59,24 +58,12 @@ function display_init(App $a) { AND `guid` = ? LIMIT 1", $a->argv[1]); } - // Or is it anywhere on the server? - 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` = ? LIMIT 1", $a->argv[1]); - } - if (!DBM::is_result($r)) { $a->error = 404; notice(t('Item not found.') . EOL); return; } - } elseif (($a->argc == 3) && ($nick == '_feed_')) { + } elseif (($a->argc == 3) && ($nick == 'feed-item')) { $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` @@ -123,7 +110,6 @@ function display_init(App $a) { } function display_fetchauthor($a, $item) { - $profiledata = array(); $profiledata["uid"] = -1; $profiledata["nickname"] = $item["author-name"]; @@ -206,7 +192,6 @@ function display_fetchauthor($a, $item) { } function display_content(App $a, $update = false, $update_uid = 0) { - if (Config::get('system','block_public') && !local_user() && !remote_user()) { notice(t('Public access denied.') . EOL); return; @@ -216,15 +201,8 @@ function display_content(App $a, $update = false, $update_uid = 0) { require_once('include/conversation.php'); require_once('include/acl_selectors.php'); - $o = ''; - if ($update) { - $nick = $_REQUEST['nick']; - } else { - $nick = (($a->argc > 1) ? $a->argv[1] : ''); - } - if ($update) { $item_id = $_REQUEST['item_id']; $item = dba::select('item', ['uid'], ['id' => $item_id], ['limit' => 1]); @@ -234,7 +212,6 @@ function display_content(App $a, $update = false, $update_uid = 0) { if ($a->argc == 2) { $item_parent = 0; - $nick = ""; if (local_user()) { $r = dba::fetch_first("SELECT `id`, `parent` FROM `item` @@ -243,7 +220,6 @@ function display_content(App $a, $update = false, $update_uid = 0) { if (DBM::is_result($r)) { $item_id = $r["id"]; $item_parent = $r["parent"]; - $nick = $a->user["nickname"]; } } @@ -259,29 +235,6 @@ function display_content(App $a, $update = false, $update_uid = 0) { $item_parent = $r["parent"]; } } - 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 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 = 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; } } @@ -295,11 +248,8 @@ function display_content(App $a, $update = false, $update_uid = 0) { $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'; + $alternate = System::baseUrl().'/display/feed-item/'.$item_id.'.atom'; + $conversation = System::baseUrl().'/display/feed-item/'.$item_parent.'/conversation.atom'; } else { $alternate = ''; $conversation = ''; @@ -356,14 +306,13 @@ function display_content(App $a, $update = false, $update_uid = 0) { } // We need the editor here to be able to reshare an item. - if ($is_owner) { $x = array( 'is_owner' => true, 'allow_location' => $a->user['allow_location'], 'default_location' => $a->user['default-location'], 'nickname' => $a->user['nickname'], - 'lockstate' => ( (is_array($a->user)) && ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid']))) ? 'lock' : 'unlock'), + 'lockstate' => (is_array($a->user) && (strlen($a->user['allow_cid']) || strlen($a->user['allow_gid']) || strlen($a->user['deny_cid']) || strlen($a->user['deny_gid'])) ? 'lock' : 'unlock'), 'acl' => populate_acl($a->user, true), 'bang' => '', 'visitor' => 'block', @@ -373,7 +322,7 @@ function display_content(App $a, $update = false, $update_uid = 0) { $o .= status_editor($a,$x,0,true); } - $sql_extra = item_permissions_sql($a->profile['uid'],$remote_contact,$groups); + $sql_extra = item_permissions_sql($a->profile['uid'], $remote_contact, $groups); if ($update) { $r = dba::p("SELECT `id` FROM `item` WHERE @@ -393,114 +342,81 @@ function display_content(App $a, $update = false, $update_uid = 0) { $item_id ); - if (!DBM::is_result($r) && local_user()) { - // Check if this is another person's link to a post that we have - $r = dba::fetch_first("SELECT `item`.uri FROM `item` - WHERE (`item`.`id` = ? OR `item`.`uri` = ?) - LIMIT 1", - $item_id, - $item_id - ); - 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)) { + notice(t('Item not found.') . EOL); + return $o; } - if (DBM::is_result($r)) { - $s = dba::inArray($r); + $s = dba::inArray($r); - 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)); - } + 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($s, "`commented`"); - - if (!$update) { - $o .= ""; - } - $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($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($s[0]["author-thumb"]); + $items = conv_sort($s, "`commented`"); - if ($title == "") { - $title = $author_name; - } + if (!$update) { + $o .= ""; + } + $o .= conversation($a, $items, 'display', $update_uid); - // Limit the description to 160 characters - if (strlen($description) > 160) { - $description = substr($description, 0, 157) . '...'; - } + // Preparing the meta header + require_once('include/bbcode.php'); + require_once("include/html2plain.php"); + $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"]; - $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 - - // - $a->page['htmlhead'] .= ''."\n"; - $a->page['htmlhead'] .= ''."\n"; - $a->page['htmlhead'] .= ''."\n"; - $a->page['htmlhead'] .= ''."\n"; - - // Schema.org microdata - $a->page['htmlhead'] .= ''."\n"; - $a->page['htmlhead'] .= ''."\n"; - $a->page['htmlhead'] .= ''."\n"; - $a->page['htmlhead'] .= ''."\n"; - - // Twitter cards - $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"; - $a->page['htmlhead'] .= ''."\n"; - - // Open Graph - $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 + $image = $a->remove_baseurl($s[0]["author-thumb"]); - return $o; + if ($title == "") { + $title = $author_name; } - $r = dba::fetch_first("SELECT `id`,`deleted` FROM `item` WHERE `id` = ? OR `uri` = ? LIMIT 1", - $item_id, - $item_id - ); - if (DBM::is_result($r)) { - if ($r['deleted']) { - notice(t('Item has been removed.') . EOL); - } else { - notice(t('Permission denied.') . EOL); - } - } else { - notice(t('Item not found.') . EOL); + + // 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 + $author_name = htmlspecialchars($author_name, ENT_COMPAT, 'UTF-8', true); // allow double encoding here + + // + $a->page['htmlhead'] .= ''."\n"; + $a->page['htmlhead'] .= ''."\n"; + $a->page['htmlhead'] .= ''."\n"; + $a->page['htmlhead'] .= ''."\n"; + + // Schema.org microdata + $a->page['htmlhead'] .= ''."\n"; + $a->page['htmlhead'] .= ''."\n"; + $a->page['htmlhead'] .= ''."\n"; + $a->page['htmlhead'] .= ''."\n"; + + // Twitter cards + $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"; + $a->page['htmlhead'] .= ''."\n"; + + // Open Graph + $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 + return $o; } diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php index d8c6655ba4..eeedd6324d 100644 --- a/src/Protocol/DFRN.php +++ b/src/Protocol/DFRN.php @@ -348,7 +348,7 @@ class DFRN killme(); } } else { - $owner = ['uid' => 0, 'nick' => '_feed_']; + $owner = ['uid' => 0, 'nick' => 'feed-item']; } $doc = new DOMDocument('1.0', 'utf-8');