From b2724f2ffd9bc6b0ed32f02a5baba1cd7a1db53a Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 13 Feb 2013 15:39:48 -0800 Subject: bring mod_common into the modern age --- mod/common.php | 113 +++++++++++++++++++++------------------------------------ 1 file changed, 42 insertions(+), 71 deletions(-) (limited to 'mod/common.php') diff --git a/mod/common.php b/mod/common.php index 617b5b670..bd2a0eef7 100644 --- a/mod/common.php +++ b/mod/common.php @@ -2,99 +2,71 @@ require_once('include/socgraph.php'); -function common_content(&$a) { - - $o = ''; - - $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; +function common_init(&$a) { - if($cmd === 'loc' && $cid) { - $c = q("select name, url, photo from contact where id = %d and uid = %d limit 1", - intval($cid), - intval($uid) - ); - } + if(argc() > 1) + $which = argv(1); else { - $c = q("select name, url, photo from contact where self = 1 and uid = %d limit 1", - intval($uid) - ); - } - - $a->page['aside'] .= '
' - . '
' . $c[0]['name'] . '
' - . '
' - . '' . $c[0]['name'] . '
' - . '
'; - - - if(! count($c)) + notice( t('Requested profile is not available.') . EOL ); + $a->error = 404; return; + } + + $profile = 0; + $channel = $a->get_channel(); - $o .= '

' . t('Common Friends') . '

'; - - - 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((local_user()) && (argc() > 2) && (argv(2) === 'view')) { + $which = $channel['channel_address']; + $profile = argv(1); } + // Run profile_load() here to make sure the theme is set before + // we start loading content + profile_load($a,$which,$profile); - if($cid == 0 && $zcid == 0) - return; +} +function common_aside(&$a) { + if(! $a->profile['profile_uid']) + return; - if($cid) - $t = count_common_friends($uid,$cid); - else - $t = count_common_friends_zcid($uid,$zcid); + profile_create_sidebar($a); +} - $a->set_pager_total($t); +function common_content(&$a) { - if(! $t) { - notice( t('No contacts in common.') . EOL); - return $o; - } + $o = ''; + + if(! $a->profile['profile_uid']) + return; + $observer_hash = get_observer_hash(); - if($cid) - $r = common_friends($uid,$cid); - else - $r = common_friends_zcid($uid,$zcid); + if(! perm_is_allowed($a->profile['profile_uid'],$observer_hash,'view_contacts')) { + notice( t('Permission denied.') . EOL); + return; + } + + $o .= '

' . t('Common connections') . '

'; - if(! count($r)) { + $t = count_common_friends($a->profile['profile_uid'],$observer_hash); + + if(! $t) + notice( t('No connections in common.') . EOL); return $o; } + $r = common_friends($a->profile['profile_uid'],$observer_hash); + + if($r) { + $tpl = get_markup_template('common_friends.tpl'); foreach($r as $rr) { - - $o .= replace_macros($tpl,array( + $o .= replace_macros($tpl,array( '$url' => $rr['url'], '$name' => $rr['name'], '$photo' => $rr['photo'], @@ -103,6 +75,5 @@ function common_content(&$a) { } $o .= cleardiv(); -// $o .= paginate($a); return $o; } -- cgit v1.2.3 From 3fdbb8b4ce3c328a859afd215d123bf9c7b62a12 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 13 Feb 2013 17:33:58 -0800 Subject: mod_common - use channel_id rather than channel_address --- mod/common.php | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) (limited to 'mod/common.php') diff --git a/mod/common.php b/mod/common.php index bd2a0eef7..87dd9e63a 100644 --- a/mod/common.php +++ b/mod/common.php @@ -4,26 +4,20 @@ require_once('include/socgraph.php'); function common_init(&$a) { - if(argc() > 1) - $which = argv(1); + if(argc() > 1 && intval(argv(1))) + $channel_id = intval(argv(1)); else { - notice( t('Requested profile is not available.') . EOL ); + notice( t('No channel.') . EOL ); $a->error = 404; return; } - $profile = 0; - $channel = $a->get_channel(); + $x = q("select channel_address from channel where channel_id = %d limit 1", + intval($channel_id) + }; - if((local_user()) && (argc() > 2) && (argv(2) === 'view')) { - $which = $channel['channel_address']; - $profile = argv(1); - } - - // Run profile_load() here to make sure the theme is set before - // we start loading content - - profile_load($a,$which,$profile); + if($x) + profile_load($a,$x[0]['channel_address'],0); } -- cgit v1.2.3 From 27aa8560ae3b93d7d9111a116a294cc3f2911801 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 13 Feb 2013 17:35:14 -0800 Subject: catch all the changes --- mod/common.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mod/common.php') diff --git a/mod/common.php b/mod/common.php index 87dd9e63a..f7b854922 100644 --- a/mod/common.php +++ b/mod/common.php @@ -14,7 +14,7 @@ function common_init(&$a) { $x = q("select channel_address from channel where channel_id = %d limit 1", intval($channel_id) - }; + ); if($x) profile_load($a,$x[0]['channel_address'],0); -- cgit v1.2.3 From cd14b0665e8eb2c691cc4a97b792a2ca70d0751c Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 13 Feb 2013 17:37:37 -0800 Subject: two really bad typos cancelled each other out so typo couldn't see either. --- mod/common.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'mod/common.php') diff --git a/mod/common.php b/mod/common.php index f7b854922..644009236 100644 --- a/mod/common.php +++ b/mod/common.php @@ -48,7 +48,7 @@ function common_content(&$a) { $t = count_common_friends($a->profile['profile_uid'],$observer_hash); - if(! $t) + if(! $t) { notice( t('No connections in common.') . EOL); return $o; } @@ -57,9 +57,9 @@ function common_content(&$a) { if($r) { - $tpl = get_markup_template('common_friends.tpl'); + $tpl = get_markup_template('common_friends.tpl'); - foreach($r as $rr) { + foreach($r as $rr) { $o .= replace_macros($tpl,array( '$url' => $rr['url'], '$name' => $rr['name'], -- cgit v1.2.3 From ca08f13683bce78a76d40247e1fcd3f166eeba8b Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 13 Feb 2013 17:39:14 -0800 Subject: Sigh... I need another cuppa --- mod/common.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'mod/common.php') diff --git a/mod/common.php b/mod/common.php index 644009236..c6294f5a2 100644 --- a/mod/common.php +++ b/mod/common.php @@ -61,13 +61,15 @@ function common_content(&$a) { foreach($r as $rr) { $o .= replace_macros($tpl,array( - '$url' => $rr['url'], - '$name' => $rr['name'], - '$photo' => $rr['photo'], - '$tags' => '' - )); + '$url' => $rr['url'], + '$name' => $rr['name'], + '$photo' => $rr['photo'], + '$tags' => '' + )); + } + + $o .= cleardiv(); } - $o .= cleardiv(); return $o; } -- cgit v1.2.3 From 8b278db05c7690370945edec29a0139541538dae Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 13 Feb 2013 17:42:11 -0800 Subject: using old structures --- mod/common.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'mod/common.php') diff --git a/mod/common.php b/mod/common.php index c6294f5a2..4afaf37eb 100644 --- a/mod/common.php +++ b/mod/common.php @@ -61,10 +61,10 @@ function common_content(&$a) { foreach($r as $rr) { $o .= replace_macros($tpl,array( - '$url' => $rr['url'], - '$name' => $rr['name'], - '$photo' => $rr['photo'], - '$tags' => '' + '$url' => $rr['xchan_url'], + '$name' => $rr['xchan_name'], + '$photo' => $rr['xchan_photo_m'], + '$tags' => '' )); } -- cgit v1.2.3 From 40e2900326a25ba0e2feedb802d38b7052b194cc Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 11 Dec 2013 14:54:36 -0800 Subject: comanchify all the simple cases - those that only load a profile. Rework permission checks for the profile sidebar so that it is all done internally. Remove crepair which we aren't using. --- mod/common.php | 8 -------- 1 file changed, 8 deletions(-) (limited to 'mod/common.php') diff --git a/mod/common.php b/mod/common.php index 4afaf37eb..e19a9d3a9 100644 --- a/mod/common.php +++ b/mod/common.php @@ -21,14 +21,6 @@ function common_init(&$a) { } -function common_aside(&$a) { - if(! $a->profile['profile_uid']) - return; - - profile_create_sidebar($a); -} - - function common_content(&$a) { $o = ''; -- cgit v1.2.3