aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-05-04 01:46:36 -0700
committerfriendica <info@friendica.com>2012-05-04 01:46:36 -0700
commit9ecd128e5e2aba527138c1a4afa2ff17caebe896 (patch)
tree3631586eff2ba10088be2bf82802157a98cf0f04 /mod
parent22c8fe46a554457b43b9721f1f46739511398060 (diff)
downloadvolse-hubzilla-9ecd128e5e2aba527138c1a4afa2ff17caebe896.tar.gz
volse-hubzilla-9ecd128e5e2aba527138c1a4afa2ff17caebe896.tar.bz2
volse-hubzilla-9ecd128e5e2aba527138c1a4afa2ff17caebe896.zip
"show more" friends in common
Diffstat (limited to 'mod')
-rw-r--r--mod/common.php77
-rw-r--r--mod/contacts.php2
2 files changed, 63 insertions, 16 deletions
diff --git a/mod/common.php b/mod/common.php
index 852388c14..617b5b670 100644
--- a/mod/common.php
+++ b/mod/common.php
@@ -5,25 +5,33 @@ require_once('include/socgraph.php');
function common_content(&$a) {
$o = '';
- if(! local_user()) {
- notice( t('Permission denied.') . EOL);
- return;
- }
- if($a->argc > 1)
- $cid = intval($a->argv[1]);
- if(! $cid)
+ $cmd = $a->argv[1];
+ $uid = intval($a->argv[2]);
+ $cid = intval($a->argv[3]);
+ $zcid = 0;
+
+ if($cmd !== 'loc' && $cmd != 'rem')
+ return;
+ if(! $uid)
return;
- $c = q("select name, url, photo from contact where id = %d and uid = %d limit 1",
- intval($cid),
- intval(local_user())
- );
+ if($cmd === 'loc' && $cid) {
+ $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",
+ intval($uid)
+ );
+ }
$a->page['aside'] .= '<div class="vcard">'
. '<div class="fn label">' . $c[0]['name'] . '</div>'
. '<div id="profile-photo-wrapper">'
- . '<a href="/contacts/' . $cid . '"><img class="photo" width="175" height="175"
+ . '<img class="photo" width="175" height="175"
src="' . $c[0]['photo'] . '" alt="' . $c[0]['name'] . '" /></div>'
. '</div>';
@@ -33,13 +41,52 @@ function common_content(&$a) {
$o .= '<h2>' . t('Common Friends') . '</h2>';
-// $o .= '<h3>' . sprintf( t('You and %s'),$c[0]['name']) . '</h3>';
+ if(! $cid) {
+ if(get_my_url()) {
+ $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",
+ dbesc(normalise_link(get_my_url()))
+ );
+ if(count($r))
+ $zcid = $r[0]['id'];
+ }
+ }
+ }
+
+
+
+ if($cid == 0 && $zcid == 0)
+ return;
+
+
+ if($cid)
+ $t = count_common_friends($uid,$cid);
+ else
+ $t = count_common_friends_zcid($uid,$zcid);
+
+
+ $a->set_pager_total($t);
+
+ if(! $t) {
+ notice( t('No contacts in common.') . EOL);
+ return $o;
+ }
+
+
+ if($cid)
+ $r = common_friends($uid,$cid);
+ else
+ $r = common_friends_zcid($uid,$zcid);
- $r = common_friends(local_user(),$cid);
if(! count($r)) {
- $o .= t('No friends in common.');
return $o;
}
diff --git a/mod/contacts.php b/mod/contacts.php
index 3b428914c..769239fe0 100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -325,7 +325,7 @@ function contacts_content(&$a) {
'$lbl_info1' => t('Contact Information / Notes'),
'$infedit' => t('Edit contact notes'),
'$common_text' => $common_text,
- '$common_link' => $a->get_baseurl(true) . '/common/' . $contact['id'],
+ '$common_link' => $a->get_baseurl(true) . '/common/loc/' . local_user() . '/' . $contact['id'],
'$all_friends' => $all_friends,
'$relation_text' => $relation_text,
'$visit' => sprintf( t('Visit %s\'s profile [%s]'),$contact['name'],$contact['url']),