X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fprofile.php;h=5efb28ea752a769e5a1adfa9ca83f213bf70eee4;hb=4eb1c1eb1a9d830151aa6437fefb4e7a590064e8;hp=2356f913e3af0a0208c4114be7d33e478cfff2f0;hpb=e79cb38217a51fb9142d3ba3c0763c9742b28f64;p=friendica.git
diff --git a/mod/profile.php b/mod/profile.php
index 2356f913e3..5efb28ea75 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -24,7 +24,7 @@ function profile_load(&$a, $username, $profile = 0) {
);
if(($r === false) || (! count($r))) {
- notice("No profile" . EOL );
+ notice( t('No profile') . EOL );
$a->error = 404;
return;
}
@@ -34,6 +34,7 @@ function profile_load(&$a, $username, $profile = 0) {
$a->page['template'] = 'profile';
$a->page['title'] = $a->profile['name'];
+ $_SESSION['theme'] = $a->profile['theme'];
return;
}}
@@ -43,29 +44,22 @@ function profile_init(&$a) {
if($a->argc > 1)
$which = $a->argv[1];
else {
- notice("No profile" . EOL );
+ notice( t('No profile') . EOL );
$a->error = 404;
return;
}
- if((remote_user()) && ($a->argc > 2) && ($a->argv[2] == 'visit'))
- $_SESSION['is_visitor'] = 1;
- else {
- unset($_SESSION['is_visitor']);
- unset($_SESSION['visitor_id']);
- if(! $_SESSION['uid'])
- unset($_SESSION['authenticated']);
- }
-
$profile = 0;
if((local_user()) && ($a->argc > 2) && ($a->argv[2] == 'view')) {
$which = $a->user['nickname'];
$profile = $a->argv[1];
}
profile_load($a,$which,$profile);
- $a->page['htmlhead'] .= '';
+ $a->page['htmlhead'] .= '' . "\r\n" ;
- $a->page['htmlhead'] .= "get_baseurl() . "/profile/%s" . "\" />\r\n";
+ $a->page['htmlhead'] .= '' . "\r\n" ;
+ $a->page['htmlhead'] .= '' . "\r\n" ;
+
$dfrn_pages = array('request', 'confirm', 'notify', 'poll');
foreach($dfrn_pages as $dfrn)
@@ -84,24 +78,39 @@ function profile_content(&$a, $update = false) {
$tab = 'posts';
- if(! $update) {
+ if($update) {
+ // Ensure we've got a profile owner if updating.
+ $a->profile['profile_uid'] = $_SESSION['profile_uid'];
+ }
+ else {
+ // set the uid so we can pick it up during update
$_SESSION['profile_uid'] = $a->profile['uid'];
}
+ $contact = null;
+ $remote_contact = false;
+
if(remote_user()) {
$contact_id = $_SESSION['visitor_id'];
$groups = init_groups_visitor($contact_id);
- }
- if(local_user()) {
- $contact_id = $_SESSION['cid'];
+ $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+ intval($contact_id),
+ intval($a->profile['profile_uid'])
+ );
+ if(count($r)) {
+ $contact = $r[0];
+ $remote_contact = true;
+ }
}
- if($update) {
- // Ensure we've got a profile owner if updating.
- $a->profile['profile_uid'] = $_SESSION['profile_uid'];
+ if(! $remote_contact) {
+ if(local_user()) {
+ $contact_id = $_SESSION['cid'];
+ $contact = $a->contact;
+ }
}
- else {
+ if(! $update) {
if(x($_GET,'tab'))
$tab = notags(trim($_GET['tab']));
@@ -131,9 +140,11 @@ function profile_content(&$a, $update = false) {
$lockstate = 'unlock';
$o .= replace_macros($tpl,array(
'$baseurl' => $a->get_baseurl(),
+ '$defloc' => (($_SESSION['uid'] == $a->profile['profile_uid']) ? $a->user['default-location'] : ''),
'$return_path' => $a->cmd,
'$visitor' => (($_SESSION['uid'] == $a->profile['profile_uid']) ? 'block' : 'none'),
'$lockstate' => $lockstate,
+ '$bang' => '',
'$acl' => (($_SESSION['uid'] == $a->profile['profile_uid']) ? populate_acl($a->user) : ''),
'$profile_uid' => $a->profile['profile_uid']
));
@@ -149,9 +160,12 @@ function profile_content(&$a, $update = false) {
$sql_extra = " AND `allow_cid` = '' AND `allow_gid` = '' AND `deny_cid` = '' AND `deny_gid` = '' ";
+
+
+
// Profile owner - everything is visible
- if(local_user() && ($_SESSION['uid'] == $a->profile['uid'])) {
+ if(local_user() && ($_SESSION['uid'] == $a->profile['profile_uid'])) {
$sql_extra = '';
// Oh - while we're here... reset the Unseen messages
@@ -164,7 +178,10 @@ function profile_content(&$a, $update = false) {
}
// authenticated visitor - here lie dragons
- elseif(remote_user()) {
+ // If $remotecontact is true, we know that not only is this a remotely authenticated
+ // person, but that it is *our* contact, which is important in multi-user mode.
+
+ elseif($remote_contact) {
$gs = '<<>>'; // should be impossible to match
if(count($groups)) {
foreach($groups as $g)
@@ -187,9 +204,9 @@ function profile_content(&$a, $update = false) {
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
- AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` AND `type` != 'remote')
+ AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` AND `wall` = 1 )
$sql_extra ",
- intval($a->profile['uid'])
+ intval($a->profile['profile_uid'])
);
@@ -203,10 +220,10 @@ function profile_content(&$a, $update = false) {
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
- AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` AND `type` != 'remote')
+ AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` AND `wall` = 1 )
$sql_extra
- ORDER BY `parent` DESC, `id` ASC LIMIT %d ,%d ",
- intval($a->profile['uid']),
+ ORDER BY `parent` DESC, `gravity` ASC, `id` ASC LIMIT %d ,%d ",
+ intval($a->profile['profile_uid']),
intval($a->pager['start']),
intval($a->pager['itemspage'])
@@ -215,6 +232,8 @@ function profile_content(&$a, $update = false) {
$cmnt_tpl = file_get_contents('view/comment_item.tpl');
+ $like_tpl = file_get_contents('view/like.tpl');
+
$tpl = file_get_contents('view/wall_item.tpl');
if($update)
@@ -222,26 +241,60 @@ function profile_content(&$a, $update = false) {
else
$return_url = $_SESSION['return_url'] = $a->cmd;
+ $alike = array();
+ $dlike = array();
+
if(count($r)) {
+
foreach($r as $item) {
+
+ if(($item['verb'] == ACTIVITY_LIKE) && ($item['id'] != $item['parent'])) {
+ $url = $item['url'];
+ if(($item['rel'] == REL_VIP || $item['rel'] == REL_BUD) && (! $item['self']))
+ $url = $a->get_baseurl() . '/redir/' . $item['contact-id'];
+ if(! is_array($alike[$item['parent'] . '-l']))
+ $alike[$item['parent'] . '-l'] = array();
+ $alike[$item['parent']] ++;
+ $alike[$item['parent'] . '-l'][] = '' . $item['name'] . '';
+ }
+ if(($item['verb'] == ACTIVITY_DISLIKE) && ($item['id'] != $item['parent'])) {
+ $url = $item['url'];
+ if(($item['rel'] == REL_VIP || $item['rel'] == REL_BUD) && (! $item['self']))
+ $url = $a->get_baseurl() . '/redir/' . $item['contact-id'];
+ if(! is_array($dlike[$item['parent'] . '-l']))
+ $dlike[$item['parent'] . '-l'] = array();
+ $dlike[$item['parent']] ++;
+ $dlike[$item['parent'] . '-l'][] = '' . $item['name'] . '';
+ }
+ }
+
+ foreach($r as $item) {
+
+
$comment = '';
+ $likebuttons = '';
+
$template = $tpl;
$redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
-
+ if((($item['verb'] == ACTIVITY_LIKE) || ($item['verb'] == ACTIVITY_DISLIKE)) && ($item['id'] != $item['parent']))
+ continue;
- if(can_write_wall($a,$a->profile['uid'])) {
+ if(can_write_wall($a,$a->profile['profile_uid'])) {
+ if($item['id'] == $item['parent']) {
+ $likebuttons = replace_macros($like_tpl,array('$id' => $item['id']));
+ }
if($item['last-child']) {
$comment = replace_macros($cmnt_tpl,array(
'$return_path' => $_SESSION['return_url'],
'$type' => 'wall-comment',
'$id' => $item['item_id'],
'$parent' => $item['parent'],
- '$profile_uid' => $a->profile['uid'],
- '$mylink' => $a->contact['url'],
+ '$profile_uid' => $a->profile['profile_uid'],
+ '$mylink' => $contact['url'],
'$mytitle' => t('Me'),
- '$myphoto' => $a->contact['thumb'],
+ '$myphoto' => $contact['thumb'],
'$ww' => ''
));
}
@@ -253,13 +306,9 @@ function profile_content(&$a, $update = false) {
// This is my profile but I'm not the author of this post/comment. If it's somebody that's a fan or mutual friend,
// I can go directly to their profile as an authenticated guest.
- if(local_user() && ($item['contact-uid'] == $_SESSION['uid']) && (strlen($item['dfrn-id'])) && (! $item['self'] ))
+ if(local_user() && ($item['contact-uid'] == $_SESSION['uid'])
+ && ($item['rel'] == DIRECTION_IN || $item['rel'] == DIRECTION_BOTH) && (! $item['self'] ))
$profile_url = $redirect_url;
-
- // FIXME tryng to solve the mishmash of profile photos.
-
- // $photo = (($item['self']) ? $a->profile['photo'] : $item['photo']);
- // $thumb = (($item['self']) ? $a->profile['thumb'] : $item['thumb']);
// We received this post via a remote feed. It's either a wall-to-wall or a remote comment. The author is
@@ -276,6 +325,8 @@ function profile_content(&$a, $update = false) {
$drop = replace_macros(file_get_contents('view/wall_item_drop.tpl'), array('$id' => $item['id']));
+ $like = (($alike[$item['id']]) ? format_like($alike[$item['id']],$alike[$item['id'] . '-l'],'like',$item['id']) : '');
+ $dislike = (($dlike[$item['id']]) ? format_like($dlike[$item['id']],$dlike[$item['id'] . '-l'],'dislike',$item['id']) : '');
$o .= replace_macros($template,array(
@@ -286,8 +337,12 @@ function profile_content(&$a, $update = false) {
'$title' => $item['title'],
'$body' => bbcode($item['body']),
'$ago' => relative_date($item['created']),
+ '$location' => (($item['location']) ? '' . $item['location'] . '' : ''),
'$indent' => (($item['parent'] != $item['item_id']) ? ' comment' : ''),
'$drop' => $drop,
+ '$like' => $like,
+ '$vote' => $likebuttons,
+ '$dislike' => $dislike,
'$comment' => $comment
));