X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fconversation.php;h=916a9e229e4bac1190889e5385087ed49e842cc0;hb=98b727029570b96febd0c5046b688cab1a9bb882;hp=e74f4c33f0c1798d7d12762303da18f6a66edf82;hpb=eec626f6bf3b57012eeba3dd4f47af3046392673;p=friendica.git diff --git a/include/conversation.php b/include/conversation.php index e74f4c33f0..916a9e229e 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -109,7 +109,7 @@ function localize_item(&$item){ $r = q("SELECT * from `item`,`contact` WHERE `item`.`contact-id`=`contact`.`id` AND `item`.`uri`='%s';", dbesc($item['parent-uri'])); - if(count($r)==0) return; + if (!dbm::is_result($r)) return; $obj=$r[0]; $author = '[url=' . $item['author-link'] . ']' . $item['author-name'] . '[/url]'; @@ -245,7 +245,7 @@ function localize_item(&$item){ $r = q("SELECT * from `item`,`contact` WHERE `item`.`contact-id`=`contact`.`id` AND `item`.`uri`='%s';", dbesc($item['parent-uri'])); - if(count($r)==0) return; + if (!dbm::is_result($r)) return; $obj=$r[0]; $author = '[url=' . zrl($item['author-link']) . ']' . $item['author-name'] . '[/url]'; @@ -294,7 +294,7 @@ function localize_item(&$item){ dbesc($obj->id), intval($item['uid']) ); - if(count($r) && $r[0]['plink']) { + if (dbm::is_result($r) && $r[0]['plink']) { $target = $r[0]; $Bname = $target['author-name']; $Blink = $target['author-link']; @@ -390,7 +390,6 @@ function item_fieldlists() { /* These Fields are not added below (yet). They are here to for bug search. `item`.`type`, -`item`.`object`, `item`.`extid`, `item`.`received`, `item`.`changed`, @@ -399,7 +398,6 @@ These Fields are not added below (yet). They are here to for bug search. `item`.`target`, `item`.`resource-id`, `item`.`tag`, -`item`.`attach`, `item`.`inform`, `item`.`pubmail`, `item`.`visible`, @@ -424,7 +422,7 @@ These Fields are not added below (yet). They are here to for bug search. `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`.`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`, @@ -441,7 +439,7 @@ These Fields are not added below (yet). They are here to for bug search. function item_joins() { return "STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND - NOT `contact`.`blocked` AND NOT `contact`.`pending` + (NOT `contact`.`blocked` OR `contact`.`pending`) LEFT JOIN `contact` AS `author` ON `author`.`id`=`item`.`author-id` LEFT JOIN `contact` AS `owner` ON `owner`.`id`=`item`.`owner-id`"; } @@ -866,7 +864,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { } $o = replace_macros($page_template, array( - '$baseurl' => $a->get_baseurl($ssl_state), + '$baseurl' => App::get_baseurl($ssl_state), '$return_path' => $a->query_string, '$live_update' => $live_update_div, '$remove' => t('remove'), @@ -905,79 +903,86 @@ function best_link_url($item,&$sparkle,$ssl_state = false) { } -if(! function_exists('item_photo_menu')){ -function item_photo_menu($item){ - +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); @@ -985,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 .= "