X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fprofile.php;h=3ab77a0940ef9efc5728dbfbacf3145530897ad0;hb=fab63ca751beac91d12e06c194101cacd1f909e5;hp=9d9eb05b6bc660f7d3e3582c4f8083cec14f1d0b;hpb=5933f13ab72337554d5fa23a064a3f61f3dee5e4;p=friendica.git
diff --git a/mod/profile.php b/mod/profile.php
index 9d9eb05b6b..3ab77a0940 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -2,7 +2,6 @@
if(! function_exists('profile_load')) {
function profile_load(&$a, $username, $profile = 0) {
-
if(remote_user()) {
$r = q("SELECT `profile-id` FROM `contact` WHERE `id` = %d LIMIT 1",
intval($_SESSION['visitor_id']));
@@ -10,21 +9,27 @@ function profile_load(&$a, $username, $profile = 0) {
$profile = $r[0]['profile-id'];
}
+ $r = null;
+
if($profile) {
$profile_int = intval($profile);
- $sql_which = " AND `profile`.`id` = $profile_int ";
+ $r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `user`.* FROM `profile`
+ LEFT JOIN `user` ON `profile`.`uid` = `user`.`uid`
+ WHERE `user`.`nickname` = '%s' AND `profile`.`id` = %d LIMIT 1",
+ dbesc($username),
+ intval($profile_int)
+ );
+ }
+ if(! count($r)) {
+ $r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `user`.* FROM `profile`
+ LEFT JOIN `user` ON `profile`.`uid` = `user`.`uid`
+ WHERE `user`.`nickname` = '%s' AND `profile`.`is-default` = 1 LIMIT 1",
+ dbesc($username)
+ );
}
- else
- $sql_which = " AND `profile`.`is-default` = 1 ";
-
- $r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `user`.* FROM `profile`
- LEFT JOIN `user` ON `profile`.`uid` = `user`.`uid`
- WHERE `user`.`nickname` = '%s' $sql_which LIMIT 1",
- dbesc($username)
- );
if(($r === false) || (! count($r))) {
- notice("No profile" . EOL );
+ notice( t('No profile') . EOL );
$a->error = 404;
return;
}
@@ -34,6 +39,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,27 +49,25 @@ 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')) {
+ 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'] .= "get_baseurl() . "/profile/%s" . "\" />\r\n";
+
+ $a->page['htmlhead'] .= '' . "\r\n" ;
+ $a->page['htmlhead'] .= '' . "\r\n" ;
+ $uri = urlencode('acct:' . $a->profile['nickname'] . '@' . $a->get_hostname() . (($a->path) ? '/' . $a->path : ''));
+ $a->page['htmlhead'] .= '' . "\r\n";
+ header('Link: <' . $a->get_baseurl() . '/xrd/?uri=' . $uri . '>; rel="lrdd"; type="application/xrd+xml"');
+
$dfrn_pages = array('request', 'confirm', 'notify', 'poll');
foreach($dfrn_pages as $dfrn)
@@ -72,7 +76,8 @@ function profile_init(&$a) {
}
-function profile_content(&$a, $update = false) {
+function profile_content(&$a, $update = 0) {
+
require_once("include/bbcode.php");
require_once('include/security.php');
@@ -80,30 +85,47 @@ function profile_content(&$a, $update = false) {
$groups = array();
$tab = 'posts';
+ $o = '';
-
- if(! $update) {
- $_SESSION['profile_uid'] = $a->profile['uid'];
+ if($update) {
+ // Ensure we've got a profile owner if updating.
+ $a->profile['profile_uid'] = $update;
+ }
+ else {
+ if($a->profile['profile_uid'] == local_user())
+ $o .= '';
}
+ $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 {
+ $is_owner = ((local_user()) && (local_user() == $a->profile['profile_uid']) ? true : false);
+
+ if(! $update) {
if(x($_GET,'tab'))
$tab = notags(trim($_GET['tab']));
- $tpl = file_get_contents('view/profile_tabs.tpl');
+ $tpl = load_view_file('view/profile_tabs.tpl');
$o .= replace_macros($tpl,array(
'$url' => $a->get_baseurl() . '/' . $a->cmd,
@@ -111,37 +133,58 @@ function profile_content(&$a, $update = false) {
));
- if($tab == 'profile') {
- require_once('view/profile_advanced.php');
+ if($tab === 'profile') {
+ $lang = get_config('system','language');
+ if($lang && file_exists("view/$lang/profile_advanced.php"))
+ require_once("view/$lang/profile_advanced.php");
+ else
+ require_once('view/profile_advanced.php');
return $o;
}
+ $celeb = ((($a->profile['page-flags'] == PAGE_SOAPBOX) || ($a->profile['page-flags'] == PAGE_COMMUNITY)) ? true : false);
if(can_write_wall($a,$a->profile['profile_uid'])) {
- $tpl = file_get_contents('view/jot-header.tpl');
+
+
+ $geotag = (($is_owner && $a->profile['allow_location']) ? load_view_file('view/jot_geotag.tpl') : '');
+
+ $tpl = load_view_file('view/jot-header.tpl');
- $a->page['htmlhead'] .= replace_macros($tpl, array('$baseurl' => $a->get_baseurl()));
+ $a->page['htmlhead'] .= replace_macros($tpl, array(
+ '$baseurl' => $a->get_baseurl(),
+ '$geotag' => $geotag
+ ));
+
require_once('view/acl_selectors.php');
- $tpl = file_get_contents("view/jot.tpl");
+ $tpl = load_view_file("view/jot.tpl");
if(is_array($a->user) && ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid']))))
$lockstate = 'lock';
else
$lockstate = 'unlock';
$o .= replace_macros($tpl,array(
'$baseurl' => $a->get_baseurl(),
+ '$defloc' => (($is_owner) ? $a->user['default-location'] : ''),
'$return_path' => $a->cmd,
- '$visitor' => (($_SESSION['uid'] == $a->profile['profile_uid']) ? 'block' : 'none'),
+ '$visitor' => (($is_owner) ? 'block' : 'none'),
'$lockstate' => $lockstate,
- '$acl' => (($_SESSION['uid'] == $a->profile['profile_uid']) ? populate_acl($a->user) : ''),
+ '$bang' => '',
+ '$acl' => (($is_owner) ? populate_acl($a->user, $celeb) : ''),
'$profile_uid' => $a->profile['profile_uid']
));
}
- if($tab == 'posts' && (! $a->pager['start']))
+ // This is ugly, but we can't pass the profile_uid through the session to the ajax updater,
+ // because browser prefetching might change it on us. We have to deliver it with the page.
+
+ if($tab === 'posts' && (! $a->pager['start'])) {
$o .= '' . "\r\n";
+ $o .= "\r\n";
+ }
+
}
- // TODO alter registration and settings and profile to update contact table when names and photos change.
+ // Construct permissions
// default permissions - anonymous user
@@ -149,7 +192,7 @@ function profile_content(&$a, $update = false) {
// Profile owner - everything is visible
- if(local_user() && ($_SESSION['uid'] == $a->profile['uid'])) {
+ if($is_owner) {
$sql_extra = '';
// Oh - while we're here... reset the Unseen messages
@@ -162,7 +205,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)
@@ -184,58 +230,111 @@ function profile_content(&$a, $update = false) {
$r = q("SELECT COUNT(*) AS `total`
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
- AND NOT `item`.`type` IN ( 'remote', 'net-comment') AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+ AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+ 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'])
);
if(count($r))
$a->set_pager_total($r[0]['total']);
-
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
- `contact`.`name`, `contact`.`photo`, `contact`.`url`,
- `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
+ `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`network`, `contact`.`rel`,
+ `contact`.`thumb`, `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 `item`.`deleted` = 0
- AND NOT `item`.`type` IN ( 'remote', 'net-comment') AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+ AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+ 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'])
);
+ $cmnt_tpl = load_view_file('view/comment_item.tpl');
- $cmnt_tpl = file_get_contents('view/comment_item.tpl');
+ $like_tpl = load_view_file('view/like.tpl');
- $tpl = file_get_contents('view/wall_item.tpl');
+ $tpl = load_view_file('view/wall_item.tpl');
+
+ $droptpl = load_view_file('view/wall_item_drop.tpl');
+ $fakedrop = load_view_file('view/wall_fake_drop.tpl');
if($update)
$return_url = $_SESSION['return_url'];
else
$return_url = $_SESSION['return_url'] = $a->cmd;
+ $alike = array();
+ $dlike = array();
+
if(count($r)) {
+
foreach($r as $item) {
+
+ $sparkle = '';
+
+ if(($item['verb'] == ACTIVITY_LIKE) && ($item['id'] != $item['parent'])) {
+ $url = $item['url'];
+ if(($item['network'] === 'dfrn') && (! $item['self'])) {
+ $url = $a->get_baseurl() . '/redir/' . $item['contact-id'];
+ $sparkle = ' class="sparkle" ';
+ }
+ 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['network'] === 'dfrn') && (! $item['self'])) {
+ $url = $a->get_baseurl() . '/redir/' . $item['contact-id'];
+ $sparkle = ' class="sparkle" ';
+ }
+ 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) {
+
+ $sparkle = '';
$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;
+
+ $lock = (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid'])
+ || strlen($item['deny_cid']) || strlen($item['deny_gid']))
+ ? ''
+ : '');
- 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'],
+ '$profile_uid' => $a->profile['profile_uid'],
+ '$mylink' => $contact['url'],
+ '$mytitle' => t('This is you'),
+ '$myphoto' => $contact['thumb'],
'$ww' => ''
));
}
@@ -247,14 +346,13 @@ 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['network'] === 'dfrn') && (! $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']);
-
+ $sparkle = ' sparkle';
+ }
+ else
+ $sparkle = '';
// We received this post via a remote feed. It's either a wall-to-wall or a remote comment. The author is
// known to us and is reflected in the contact-id for this item. We can use the contact url or redirect rather than
@@ -265,25 +363,44 @@ function profile_content(&$a, $update = false) {
$profile_link = $profile_url;
$drop = '';
+ $dropping = false;
- if(($item['contact-id'] == $_SESSION['visitor_id']) || ($item['uid'] == $_SESSION['uid']))
- $drop = replace_macros(file_get_contents('view/wall_item_drop.tpl'), array('$id' => $item['id']));
+ if(($item['contact-id'] == remote_user()) || ($item['uid'] == local_user()))
+ $dropping = true;
+ $drop = replace_macros((($dropping)? $droptpl : $fakedrop), array('$id' => $item['id']));
+ $like = ((isset($alike[$item['id']])) ? format_like($alike[$item['id']],$alike[$item['id'] . '-l'],'like',$item['id']) : '');
+ $dislike = ((isset($dlike[$item['id']])) ? format_like($dlike[$item['id']],$dlike[$item['id'] . '-l'],'dislike',$item['id']) : '');
+ $location = (($item['location']) ? '' . $item['location'] . '' : '');
+ $coord = (($item['coord']) ? '' . $item['coord'] . '' : '');
+ if($coord) {
+ if($location)
+ $location .= '
(' . $coord . ')';
+ else
+ $location = '' . $coord . '';
+ }
$o .= replace_macros($template,array(
'$id' => $item['item_id'],
'$profile_url' => $profile_link,
'$name' => $profile_name,
'$thumb' => $profile_avatar,
+ '$sparkle' => $sparkle,
'$title' => $item['title'],
'$body' => bbcode($item['body']),
'$ago' => relative_date($item['created']),
+ '$lock' => $lock,
+ '$location' => $location,
'$indent' => (($item['parent'] != $item['item_id']) ? ' comment' : ''),
'$drop' => $drop,
+ '$like' => $like,
+ '$vote' => $likebuttons,
+ '$dislike' => $dislike,
'$comment' => $comment
));
+
}
}
