strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1936 from annando/1510-contact-menu

Browse source 
The contact menu is now improved (for example a "Follow" link)
This commit is contained in:
Tobias Diekershoff 2015-10-04 21:30:35 +02:00
parent e10dc09bbc b037f977fa
commit 79391bbb62
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
include/conversation.php
View file

@ -204,7 +204,7 @@ function localize_item(&$item){
// we can't have a translation string with three positions but no distinguishable text // we can't have a translation string with three positions but no distinguishable text
// So here is the translate string. // So here is the translate string.
$txt = t('%1$s poked %2$s'); $txt = t('%1$s poked %2$s');
// now translate the verb // now translate the verb
$poked_t = trim(sprintf($txt, "","")); $poked_t = trim(sprintf($txt, "",""));
$txt = str_replace( $poked_t, t($verb), $txt); $txt = str_replace( $poked_t, t($verb), $txt);
@ -850,7 +850,12 @@ function item_photo_menu($item){
$cid = $item['contact-id']; $cid = $item['contact-id'];
} }
else { else {
$cid = 0; $r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' ORDER BY `uid` DESC LIMIT 1",
intval($item['uid']), normalise_link($item['author-link']));
if ($r)
$cid = $r[0]["id"];
else
$cid = 0;
} }
} }
if(($cid) && (! $item['self'])) { if(($cid) && (! $item['self'])) {
@ -877,10 +882,14 @@ function item_photo_menu($item){
t("View Photos") => $photos_link, t("View Photos") => $photos_link,
t("Network Posts") => $posts_link, t("Network Posts") => $posts_link,
t("Edit Contact") => $contact_url, t("Edit Contact") => $contact_url,
t("Send PM") => $pm_url, t("Send PM") => $pm_url
t("Poke") => $poke_link
); );
if ($a->contacts[$clean_url]['network'] === NETWORK_DFRN)
$menu[t("Poke")] = $poke_link;
if (($cid == 0) AND in_array($item['network'], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA)))
$menu[t("Connect/Follow")] = $a->get_baseurl($ssl_state)."/follow?url=".urlencode($item['author-link']);
$args = array('item' => $item, 'menu' => $menu); $args = array('item' => $item, 'menu' => $menu);