X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fconversation.php;h=1c11d10b57643635659b3ed364c880892a39aa09;hb=d49325d177cf03b97df250ca3cb081421c541049;hp=8f94d96301653094f46f70e82655f4e3d013b331;hpb=869a4394661bf1399f44d3f745b0a15c3224d5b2;p=friendica.git diff --git a/include/conversation.php b/include/conversation.php index 8f94d96301..1c11d10b57 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -374,53 +374,82 @@ function visible_activity($item) { } /** - * @brief List of all contact fields that are needed for the conversation function + * @brief SQL query for items */ -function contact_fieldlist() { +function item_query() { - $fieldlist = "`contact`.`network`, `contact`.`url`, `contact`.`name`, `contact`.`writable`, - `contact`.`self`, `contact`.`id` AS `cid`, `contact`.`alias`"; - - return $fieldlist; + return "SELECT ".item_fieldlists()." FROM `item` ". + item_joins()." WHERE ".item_condition(); } /** - * @brief SQL condition for contacts + * @brief List of all data fields that are needed for displaying items */ -function contact_condition() { - - $condition = "NOT `contact`.`blocked` AND NOT `contact`.`pending`"; - - return $condition; +function item_fieldlists() { + +/* +These Fields are not added below (yet). They are here to for bug search. +`item`.`type`, +`item`.`extid`, +`item`.`received`, +`item`.`changed`, +`item`.`moderated`, +`item`.`target-type`, +`item`.`target`, +`item`.`resource-id`, +`item`.`tag`, +`item`.`inform`, +`item`.`pubmail`, +`item`.`visible`, +`item`.`spam`, +`item`.`bookmark`, +`item`.`unseen`, +`item`.`deleted`, +`item`.`origin`, +`item`.`forum_mode`, +`item`.`last-child`, +`item`.`mention`, +`item`.`global`, +`item`.`gcontact-id`, +`item`.`shadow`, +*/ + + return "`item`.`author-link`, `item`.`author-name`, `item`.`author-avatar`, + `item`.`owner-link`, `item`.`owner-name`, `item`.`owner-avatar`, + `item`.`contact-id`, `item`.`uid`, `item`.`id`, `item`.`parent`, + `item`.`uri`, `item`.`thr-parent`, `item`.`parent-uri`, + `item`.`commented`, `item`.`created`, `item`.`edited`, + `item`.`verb`, `item`.`object-type`, `item`.`postopts`, `item`.`plink`, + `item`.`guid`, `item`.`wall`, `item`.`private`, `item`.`starred`, + `item`.`title`, `item`.`body`, `item`.`file`, `item`.`event-id`, + `item`.`location`, `item`.`coord`, `item`.`app`, `item`.`attach`, + `item`.`rendered-hash`, `item`.`rendered-html`, `item`.`object`, + `item`.`allow_cid`, `item`.`allow_gid`, `item`.`deny_cid`, `item`.`deny_gid`, + `item`.`id` AS `item_id`, `item`.`network` AS `item_network`, + + `author`.`thumb` AS `author-thumb`, `owner`.`thumb` AS `owner-thumb`, + + `contact`.`network`, `contact`.`url`, `contact`.`name`, `contact`.`writable`, + `contact`.`self`, `contact`.`id` AS `cid`, `contact`.`alias`"; } /** - * @brief List of all item fields that are needed for the conversation function + * @brief SQL join for contacts that are needed for displaying items */ -function item_fieldlist() { - - $fieldlist = "`item`.`author-link`, `item`.`verb`, `item`.`id`, `item`.`parent`, - `item`.`uid`, `item`.`author-name`, `item`.`location`, `item`.`coord`, - `item`.`title`, `item`.`uri`, `item`.`created`, `item`.`app`, `item`.`guid`, - `item`.`contact-id`, `item`.`thr-parent`, `item`.`parent-uri`, `item`.`rendered-hash`, - `item`.`body`, `item`.`rendered-html`, `item`.`private`, `item`.`edited`, - `item`.`allow_cid`, `item`.`allow_gid`, `item`.`deny_cid`, `item`.`deny_gid`, - `item`.`event-id`, `item`.`object-type`, `item`.`starred`, `item`.`created`, - `item`.`postopts`, `item`.`owner-link`, `item`.`owner-name`, `item`.`owner-avatar`, - `item`.`plink`, `item`.`wall`, - `item`.`id` AS `item_id`, `item`.`network` AS `item_network`"; - - return $fieldlist; +function item_joins() { + + return "STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND + NOT `contact`.`blocked` + LEFT JOIN `contact` AS `author` ON `author`.`id`=`item`.`author-id` + LEFT JOIN `contact` AS `owner` ON `owner`.`id`=`item`.`owner-id`"; } /** - * @brief SQL condition for items + * @brief SQL condition for items that are needed for displaying items */ function item_condition() { - $condition = "`item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`"; - - return $condition; + return "`item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`"; } /** @@ -592,7 +621,6 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { $comment = ''; $owner_url = ''; - $owner_photo = ''; $owner_name = ''; $sparkle = ''; @@ -637,18 +665,6 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { $tags[] = $prefix."".$tag["term"].""; } - /*foreach(explode(',',$item['tag']) as $tag){ - $tag = trim($tag); - if ($tag!="") { - $t = bbcode($tag); - $tags[] = $t; - if($t[0] == '#') - $hashtags[] = $t; - elseif($t[0] == '@') - $mentions[] = $t; - } - }*/ - $sp = false; $profile_link = best_link_url($item,$sp); if($profile_link === 'mailbox') @@ -658,12 +674,21 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { else $profile_link = zrl($profile_link); - // Don't rely on the author-avatar. It is better to use the data from the contact table - $author_contact = get_contact_details_by_url($item['author-link'], $profile_owner); - if ($author_contact["thumb"]) - $profile_avatar = $author_contact["thumb"]; - else - $profile_avatar = $item['author-avatar']; + if (!isset($item['author-thumb']) OR ($item['author-thumb'] == "")) { + $author_contact = get_contact_details_by_url($item['author-link'], $profile_owner); + if ($author_contact["thumb"]) + $item['author-thumb'] = $author_contact["thumb"]; + else + $item['author-thumb'] = $item['author-avatar']; + } + + if (!isset($item['owner-thumb']) OR ($item['owner-thumb'] == "")) { + $owner_contact = get_contact_details_by_url($item['owner-link'], $profile_owner); + if ($owner_contact["thumb"]) + $item['owner-thumb'] = $owner_contact["thumb"]; + else + $item['owner-thumb'] = $item['owner-avatar']; + } $locate = array('location' => $item['location'], 'coord' => $item['coord'], 'html' => ''); call_hooks('render_location',$locate); @@ -731,7 +756,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { 'name' => $profile_name_e, 'sparkle' => $sparkle, 'lock' => $lock, - 'thumb' => App::remove_baseurl(proxy_url($profile_avatar, false, PROXY_SIZE_THUMB)), + 'thumb' => App::remove_baseurl(proxy_url($item['author-thumb'], false, PROXY_SIZE_THUMB)), 'title' => $item['title_e'], 'body' => $body_e, 'tags' => $tags_e, @@ -750,7 +775,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { 'indent' => '', 'owner_name' => $owner_name_e, 'owner_url' => $owner_url, - 'owner_photo' => proxy_url($owner_photo, false, PROXY_SIZE_THUMB), + 'owner_photo' => App::remove_baseurl(proxy_url($item['owner-thumb'], false, PROXY_SIZE_THUMB)), 'plink' => get_plink($item), 'edpost' => false, 'isstarred' => $isstarred, @@ -854,8 +879,6 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { function best_link_url($item,&$sparkle,$ssl_state = false) { - $a = get_app(); - $best_url = ''; $sparkle = false; @@ -880,80 +903,86 @@ function best_link_url($item,&$sparkle,$ssl_state = false) { } -if(! function_exists('item_photo_menu')){ -function item_photo_menu($item){ - $a = get_app(); - +if (! function_exists('item_photo_menu')) { +function item_photo_menu($item) +{ $ssl_state = false; - if(local_user()) + if(local_user()) { $ssl_state = true; + } - $sub_link=""; - $poke_link=""; - $contact_url=""; - $pm_url=""; - $status_link=""; - $photos_link=""; - $posts_link=""; - $network = ""; + $sub_link = ''; + $poke_link = ''; + $contact_url = ''; + $pm_url = ''; + $status_link = ''; + $photos_link = ''; + $posts_link = ''; + $network = ''; - if((local_user()) && local_user() == $item['uid'] && $item['parent'] == $item['id'] && (! $item['self'])) { + if ((local_user()) && local_user() == $item['uid'] && $item['parent'] == $item['id'] && (! $item['self'])) { $sub_link = 'javascript:dosubthread(' . $item['id'] . '); return false;'; } $sparkle = false; - $profile_link = best_link_url($item,$sparkle,$ssl_state); - if($profile_link === 'mailbox') + $profile_link = best_link_url($item, $sparkle, $ssl_state); + if ($profile_link === 'mailbox') { $profile_link = ''; + } $cid = 0; - $network = ""; + $network = ''; $rel = 0; $r = q("SELECT `id`, `network`, `rel` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' LIMIT 1", intval(local_user()), dbesc(normalise_link($item['author-link']))); if ($r) { - $cid = $r[0]["id"]; - $network = $r[0]["network"]; - $rel = $r[0]["rel"]; + $cid = $r[0]['id']; + $network = $r[0]['network']; + $rel = $r[0]['rel']; } if($sparkle) { - $status_link = $profile_link."?url=status"; - $photos_link = $profile_link."?url=photos"; - $profile_link = $profile_link."?url=profile"; + $status_link = $profile_link . '?url=status'; + $photos_link = $profile_link . '?url=photos'; + $profile_link = $profile_link . '?url=profile'; $zurl = ''; - } else + } else { $profile_link = zrl($profile_link); + } - if($cid && !$item['self']) { - $poke_link = 'poke/?f=&c='.$cid; - $contact_url = 'contacts/'.$cid; - $posts_link = 'contacts/'.$cid.'/posts'; + if ($cid && !$item['self']) { + $poke_link = 'poke/?f=&c=' . $cid; + $contact_url = 'contacts/' . $cid; + $posts_link = 'contacts/' . $cid . '/posts'; - if (in_array($network, array(NETWORK_DFRN, NETWORK_DIASPORA))) - $pm_url = 'message/new/'.$cid; + if (in_array($network, array(NETWORK_DFRN, NETWORK_DIASPORA))) { + $pm_url = 'message/new/' . $cid; + } } if (local_user()) { $menu = Array( - t("Follow Thread") => $sub_link, - t("View Status") => $status_link, - t("View Profile") => $profile_link, - t("View Photos") => $photos_link, - t("Network Posts") => $posts_link, - t("Edit Contact") => $contact_url, - t("Send PM") => $pm_url + t('Follow Thread') => $sub_link, + t('View Status') => $status_link, + t('View Profile') => $profile_link, + t('View Photos') => $photos_link, + t('Network Posts') => $posts_link, + t('View Contact') => $contact_url, + t('Send PM') => $pm_url ); - if ($network == NETWORK_DFRN) + if ($network == NETWORK_DFRN) { $menu[t("Poke")] = $poke_link; + } if ((($cid == 0) OR ($rel == CONTACT_IS_FOLLOWER)) AND - in_array($item['network'], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA))) - $menu[t("Connect/Follow")] = "follow?url=".urlencode($item['author-link']); - } else - $menu = array(t("View Profile") => $item['author-link']); + in_array($item['network'], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA))) { + $menu[t('Connect/Follow')] = 'follow?url=' . urlencode($item['author-link']); + } + } else { + $menu = array(t('View Profile') => $item['author-link']); + } $args = array('item' => $item, 'menu' => $menu); @@ -961,13 +990,14 @@ function item_photo_menu($item){ $menu = $args['menu']; - $o = ""; - foreach($menu as $k=>$v){ - if(strpos($v,'javascript:') === 0) { - $v = substr($v,11); - $o .= "