friendica/friendica
6
2
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-12-07 07:57:35 +01:00
Code Issues Projects Releases 3 Packages Wiki Activity

lots of work, 2way friends, comments...

Browse source
This commit is contained in:
Mike Macgirvin 2010-07-05 21:39:55 -07:00
commit 6817c5d59a
15 changed files with 335 additions and 159 deletions
Download patch file Download diff file Expand all files Collapse all files

41
mod/profile.php
View file

@ -64,15 +64,22 @@ function profile_init(&$a) {
$a->page['htmlhead'] .= "<link rel=\"dfrn-{$dfrn}\" href=\"".$a->get_baseurl()."/dfrn_{$dfrn}/{$which}\" />\r\n";
}
function item_display($item,$template) {
function item_display(&$a, $item,$template,$comment) {
$profile_url = $item['url'];
if(local_user() && ($item['contact-uid'] == $_SESSION['uid']) && (strlen($item['dfrn-id'])) && (! $item['self'] ))
$profile_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
$o .= replace_macros($template,array(
'$id' => $item['item_id'],
'$profile_url' => $item['url'],
'$profile_url' => $profile_url,
'$name' => $item['name'],
'$thumb' => $item['thumb'],
'$body' => bbcode($item['body']),
'$ago' => relative_date($item['created'])
'$ago' => relative_date($item['created']),
'$comment' => $comment
));
@ -89,6 +96,17 @@ function profile_content(&$a) {
// $tpl = file_get_contents('view/profile_tabs.tpl');
if(remote_user())
$contact_id = $_SESSION['visitor_id'];
if(local_user()) {
$r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
$_SESSION['uid']
);
if(count($r))
$contact_id = $r[0]['id'];
}
if(can_write_wall($a,$a->profile['profile_uid'])) {
$tpl = file_get_contents('view/jot-header.tpl');
@ -111,7 +129,8 @@ function profile_content(&$a) {
// Add comments.
$r = q("SELECT `item`.*, `contact`.`name`, `contact`.`photo`, `contact`.`thumb`, `contact`.`id` AS `cid`
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`, `contact`.`id` AS `cid`,
`contact`.`uid` AS `contact-uid`
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
WHERE `item`.`uid` = %d AND `item`.`visible` = 1
AND `contact`.`blocked` = 0
@ -121,11 +140,23 @@ function profile_content(&$a) {
intval($a->profile['uid'])
);
$template = file_get_contents('view/comment_item.tpl');
$tpl = file_get_contents('view/wall_item.tpl');
if(count($r)) {
foreach($r as $rr) {
$o .= item_display($rr,$tpl);
$comment = replace_macros($template,array(
'$id' => $rr['item_id'],
'$profile_uid' => $a->profile['profile_uid']
));
$o .= item_display($a,$rr,$tpl,$comment);
}
}
}