diff --git a/include/Contact.php b/include/Contact.php index 3f74a19d5f..db5480f517 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -245,7 +245,7 @@ function get_contact_details_by_url($url, $uid = -1) { $profile["keywords"] = $r[0]["keywords"]; if (isset($r[0]["gender"]) AND $r[0]["gender"]) $profile["gender"] = $r[0]["gender"]; - if (isset($r[0]["forum"]) AND isset($r[0]["prv"])) + if (isset($r[0]["forum"]) OR isset($r[0]["prv"])) $profile["community"] = ($r[0]["forum"] OR $r[0]["prv"]); if (isset($r[0]["network"]) AND $r[0]["network"]) $profile["network"] = $r[0]["network"]; diff --git a/mod/allfriends.php b/mod/allfriends.php index 784dfb8771..8396efdd2d 100644 --- a/mod/allfriends.php +++ b/mod/allfriends.php @@ -1,6 +1,8 @@ argc > 1) $cid = intval($a->argv[1]); + if(! $cid) return; - $c = q("select name, url, photo from contact where id = %d and uid = %d limit 1", + $uid = $a->user[uid]; + + $c = q("SELECT `name`, `url`, `photo` FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1", intval($cid), intval(local_user()) ); @@ -33,10 +38,6 @@ function allfriends_content(&$a) { if(! count($c)) return; - $o .= replace_macros(get_markup_template("section_title.tpl"),array( - '$title' => sprintf( t('Friends of %s'), htmlentities($c[0]['name'])) - )); - $r = all_friends(local_user(),$cid); @@ -45,19 +46,53 @@ function allfriends_content(&$a) { return $o; } - $tpl = get_markup_template('common_friends.tpl'); + $id = 0; foreach($r as $rr) { - $o .= replace_macros($tpl,array( - '$url' => $rr['url'], - '$name' => htmlentities($rr['name']), - '$photo' => $rr['photo'], - '$tags' => '' - )); + //get further details of the contact + $contact_details = get_contact_details_by_url($rr['url'], $uid); + + $photo_menu = ''; + + // $rr[cid] is only available for common contacts. So if the contact is a common one, use contact_photo_menu to generate the photo_menu + // If the contact is not common to the user, Connect/Follow' will be added to the photo menu + if ($rr[cid]) { + $rr[id] = $rr[cid]; + $photo_menu = contact_photo_menu ($rr); + } + else { + $connlnk = $a->get_baseurl() . '/follow/?url=' . $rr['url']; + $photo_menu = array(array(t("View Profile"), zrl($rr['url']))); + $photo_menu[] = array(t("Connect/Follow"), $connlnk); + } + + $entry = array( + 'url' => $rr['url'], + 'itemurl' => $rr['url'], + 'name' => htmlentities($rr['name']), + 'thumb' => proxy_url($rr['photo'], false, PROXY_SIZE_THUMB), + 'img_hover' => htmlentities($rr['name']), + 'details' => $contact_details['location'], + 'tags' => $contact_details['keywords'], + 'about' => $contact_details['about'], + 'account_type' => (($contact_details['community']) ? t('Forum') : ''), + 'network' => network_to_name($contact_details['network'], $contact_details['url']), + 'photo_menu' => $photo_menu, + 'conntxt' => t('Connect'), + 'connlnk' => $connlnk, + 'id' => ++$id, + ); + $entries[] = $entry; } - $o .= cleardiv(); + $tpl = get_markup_template('viewcontact_template.tpl'); + + $o .= replace_macros($tpl,array( + '$title' => sprintf( t('Friends of %s'), htmlentities($c[0]['name'])), + '$contacts' => $entries, + )); + // $o .= paginate($a); return $o; } diff --git a/mod/common.php b/mod/common.php index 1e65137ac6..560865b154 100644 --- a/mod/common.php +++ b/mod/common.php @@ -1,6 +1,8 @@ argv[3]); $zcid = 0; + if (! local_user()) { + notice( t('Permission denied.') . EOL); + return; + } + if($cmd !== 'loc' && $cmd != 'rem') return; + if(! $uid) return; if($cmd === 'loc' && $cid) { - $c = q("select name, url, photo from contact where id = %d and uid = %d limit 1", + $c = q("SELECT `name`, `url`, `photo` FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1", intval($cid), intval($uid) ); } else { - $c = q("select name, url, photo from contact where self = 1 and uid = %d limit 1", + $c = q("SELECT `name`, `url`, `photo` FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1", intval($uid) ); } @@ -41,21 +49,16 @@ function common_content(&$a) { if(! count($c)) return; - $o .= replace_macros(get_markup_template("section_title.tpl"),array( - '$title' => t('Common Friends') - )); - - if(! $cid) { if(get_my_url()) { - $r = q("select id from contact where nurl = '%s' and uid = %d limit 1", + $r = q("SELECT `id` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d LIMIT 1", dbesc(normalise_link(get_my_url())), intval($profile_uid) ); if(count($r)) $cid = $r[0]['id']; else { - $r = q("select id from gcontact where nurl = '%s' limit 1", + $r = q("SELECT `id` FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1", dbesc(normalise_link(get_my_url())) ); if(count($r)) @@ -94,19 +97,43 @@ function common_content(&$a) { return $o; } - $tpl = get_markup_template('common_friends.tpl'); + $id = 0; foreach($r as $rr) { - $o .= replace_macros($tpl,array( - '$url' => $rr['url'], - '$name' => htmlentities($rr['name']), - '$photo' => $rr['photo'], - '$tags' => '' - )); + //get further details of the contact + $contact_details = get_contact_details_by_url($rr['url'], $uid); + + // $rr[id] is needed to use contact_photo_menu() + $rr[id] = $rr[cid]; + + $photo_menu = ''; + $photo_menu = contact_photo_menu ($rr); + + $entry = array( + 'url' => $rr['url'], + 'itemurl' => $rr['url'], + 'name' => $rr['name'], + 'thumb' => proxy_url($rr['photo'], false, PROXY_SIZE_THUMB), + 'img_hover' => htmlentities($rr['name']), + 'details' => $contact_details['location'], + 'tags' => $contact_details['keywords'], + 'about' => $contact_details['about'], + 'account_type' => (($contact_details['community']) ? t('Forum') : ''), + 'network' => network_to_name($contact_details['network'], $contact_details['url']), + 'photo_menu' => $photo_menu, + 'id' => ++$id, + ); + $entries[] = $entry; } - $o .= cleardiv(); + $tpl = get_markup_template('viewcontact_template.tpl'); + + $o .= replace_macros($tpl,array( + '$title' => t('Common Friends'), + '$contacts' => $entries, + )); + // $o .= paginate($a); return $o; } diff --git a/view/templates/common_friends.tpl b/view/templates/common_friends.tpl deleted file mode 100644 index 6502dd6ed7..0000000000 --- a/view/templates/common_friends.tpl +++ /dev/null @@ -1,13 +0,0 @@ - -
-
- - {{$name}} - -
-
-
- {{$name}} -
-
-
\ No newline at end of file diff --git a/view/templates/contact_template.tpl b/view/templates/contact_template.tpl index 75f49653b0..06918533ca 100644 --- a/view/templates/contact_template.tpl +++ b/view/templates/contact_template.tpl @@ -30,11 +30,16 @@
-
{{$contact.name}}
+
+ {{$contact.name}} + {{if $contact.account_type}} ({{$contact.account_type}}){{/if}} +
{{if $contact.alt_text}}
{{$contact.alt_text}}
{{/if}} {{if $contact.itemurl}}
{{$contact.itemurl}}
{{/if}} - {{if $contact.network}}
{{$contact.network}}
{{/if}} + {{if $contact.tags}}
{{$contact.tags}}
{{/if}} {{if $contact.details}}
{{$contact.details}}
{{/if}} + {{if $contact.network}}
{{$contact.network}}
{{/if}} +
diff --git a/view/theme/frost-mobile/templates/contact_template.tpl b/view/theme/frost-mobile/templates/contact_template.tpl index 198b24746f..3395c9dadf 100644 --- a/view/theme/frost-mobile/templates/contact_template.tpl +++ b/view/theme/frost-mobile/templates/contact_template.tpl @@ -13,28 +13,32 @@ {{if $contact.photo_menu}} {{**}} -
- -
+
+ +
{{/if}}
-
{{$contact.name}}
+
+ {{$contact.name}} + {{if $contact.account_type}} ({{$contact.account_type}}){{/if}} +
{{if $contact.alt_text}}
{{$contact.alt_text}}
{{/if}} {{if $contact.itemurl}}
{{$contact.itemurl}}
{{/if}} - {{if $contact.network}}
{{$contact.network}}
{{/if}} + {{if $contact.tags}}
{{$contact.tags}}
{{/if}} {{if $contact.details}}
{{$contact.details}}
{{/if}} + {{if $contact.network}}
{{$contact.network}}
{{/if}}
diff --git a/view/theme/frost/templates/contact_template.tpl b/view/theme/frost/templates/contact_template.tpl index 777ed50179..fe491fd83a 100644 --- a/view/theme/frost/templates/contact_template.tpl +++ b/view/theme/frost/templates/contact_template.tpl @@ -27,11 +27,15 @@
-
{{$contact.name}}
+
+ {{$contact.name}} + {{if $contact.account_type}} ({{$contact.account_type}}){{/if}} +
{{if $contact.alt_text}}
{{$contact.alt_text}}
{{/if}} {{if $contact.itemurl}}
{{$contact.itemurl}}
{{/if}} - {{if $contact.network}}
{{$contact.network}}
{{/if}} + {{if $contact.tags}}
{{$contact.tags}}
{{/if}} {{if $contact.details}}
{{$contact.details}}
{{/if}} + {{if $contact.network}}
{{$contact.network}}
{{/if}}
diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css index b0489af808..485ac39387 100644 --- a/view/theme/quattro/dark/style.css +++ b/view/theme/quattro/dark/style.css @@ -1583,7 +1583,7 @@ span[id^="showmore-wrap"] { } .contact-name { font-weight: bold; - padding-top: 15px; + /* padding-top: 15px; */ } .contact-details { color: #999999; diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css index 0c7050045d..345043ffb4 100644 --- a/view/theme/quattro/green/style.css +++ b/view/theme/quattro/green/style.css @@ -1583,7 +1583,7 @@ span[id^="showmore-wrap"] { } .contact-name { font-weight: bold; - padding-top: 15px; + /* padding-top: 15px; */ } .contact-details { color: #999999; diff --git a/view/theme/quattro/lilac/style.css b/view/theme/quattro/lilac/style.css index c5f655427a..b2dec86c84 100644 --- a/view/theme/quattro/lilac/style.css +++ b/view/theme/quattro/lilac/style.css @@ -1583,7 +1583,7 @@ span[id^="showmore-wrap"] { } .contact-name { font-weight: bold; - padding-top: 15px; + /* padding-top: 15px; */ } .contact-details { color: #999999; diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index cd604b656a..7aede8df08 100644 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -908,7 +908,7 @@ span[id^="showmore-wrap"] { img { width: 175px; height: 175px; } } } -.contact-name { font-weight: bold; padding-top: 15px; } +.contact-name { font-weight: bold; /* padding-top: 15px; */} .contact-details { color: @Grey3; white-space: nowrap; overflow: hidden; diff --git a/view/theme/quattro/templates/contact_template.tpl b/view/theme/quattro/templates/contact_template.tpl index 7060505e9f..2d59a8a256 100644 --- a/view/theme/quattro/templates/contact_template.tpl +++ b/view/theme/quattro/templates/contact_template.tpl @@ -26,11 +26,15 @@ -
{{$contact.name}}
+
+ {{$contact.name}} + {{if $contact.account_type}} ({{$contact.account_type}}){{/if}} +
{{if $contact.alt_text}}
{{$contact.alt_text}}
{{/if}} {{if $contact.itemurl}}
{{$contact.itemurl}}
{{/if}} - {{if $contact.network}}
{{$contact.network}}
{{/if}} + {{if $contact.tags}}
{{$contact.tags}}
{{/if}} {{if $contact.details}}
{{$contact.details}}
{{/if}} + {{if $contact.network}}
{{$contact.network}}
{{/if}} {{if $contact.connlnk}}
{{$contact.conntxt}}
diff --git a/view/theme/vier/templates/contact_template.tpl b/view/theme/vier/templates/contact_template.tpl index 2993bb92cb..60e05610f6 100644 --- a/view/theme/vier/templates/contact_template.tpl +++ b/view/theme/vier/templates/contact_template.tpl @@ -31,11 +31,15 @@
-
{{$contact.name}}
+
+ {{$contact.name}} + {{if $contact.account_type}} ({{$contact.account_type}}){{/if}} +
{{if $contact.alt_text}}
{{$contact.alt_text}}
{{/if}} {{if $contact.itemurl}}
{{$contact.itemurl}}
{{/if}} - {{if $contact.network}}
{{$contact.network}}
{{/if}} + {{if $contact.tags}}
{{$contact.tags}}
{{/if}} {{if $contact.details}}
{{$contact.details}}
{{/if}} + {{if $contact.network}}
{{$contact.network}}
{{/if}}