X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fprofile.php;h=38061e49d8056bd59cf5c2d9886d594ec33974fc;hb=9513f1f1668a33be3fc2b241fe3662e9de42d84b;hp=ac9371ea0cfc86c335ebdfb0c8ea7e732d591080;hpb=d5a13b1e4c0f35445aa539ff6b3779062907a9cb;p=friendica.git
diff --git a/mod/profile.php b/mod/profile.php
index ac9371ea0c..38061e49d8 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']));
@@ -42,6 +41,10 @@ function profile_load(&$a, $username, $profile = 0) {
$a->page['title'] = $a->profile['name'];
$_SESSION['theme'] = $a->profile['theme'];
+ if(! (x($a->page,'aside')))
+ $a->page['aside'] = '';
+ $a->page['aside'] .= contact_block();
+
return;
}}
@@ -56,15 +59,18 @@ function profile_init(&$a) {
}
$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'] .= '' . "\r\n" ;
- $a->page['htmlhead'] .= '' . "\r\n" ;
- $a->page['htmlhead'] .= '' . "\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"', false);
$dfrn_pages = array('request', 'confirm', 'notify', 'poll');
@@ -77,23 +83,20 @@ function profile_init(&$a) {
function profile_content(&$a, $update = 0) {
- file_put_contents('uid.log',"{$_SERVER['QUERY_STRING']} ". session_id() . "\n", FILE_APPEND);
-
-
require_once("include/bbcode.php");
require_once('include/security.php');
$groups = array();
$tab = 'posts';
-
+ $o = '';
if($update) {
// Ensure we've got a profile owner if updating.
$a->profile['profile_uid'] = $update;
}
else {
- if($a->profile['profile_uid'] == get_uid())
+ if($a->profile['profile_uid'] == local_user())
$o .= '';
}
@@ -120,6 +123,8 @@ function profile_content(&$a, $update = 0) {
}
}
+ $is_owner = ((local_user()) && (local_user() == $a->profile['profile_uid']) ? true : false);
+
if(! $update) {
if(x($_GET,'tab'))
$tab = notags(trim($_GET['tab']));
@@ -132,20 +137,31 @@ function profile_content(&$a, $update = 0) {
));
- if($tab == 'profile') {
- $lang = config_get('system','language');
- if($lang && file_exists("view/$lang/profile_advanced.php"))
- require_once("view/$lang/profile_advanced.php");
+ if($tab === 'profile') {
+ $profile_lang = get_config('system','language');
+ if(! $profile_lang)
+ $profile_lang = 'en';
+ if(file_exists("view/$profile_lang/profile_advanced.php"))
+ require_once("view/$profile_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'])) {
+
+
+ $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()));
- require_once('view/acl_selectors.php');
+ $a->page['htmlhead'] .= replace_macros($tpl, array(
+ '$baseurl' => $a->get_baseurl(),
+ '$geotag' => $geotag
+ ));
+
+ require_once('include/acl_selectors.php');
$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']))))
@@ -154,12 +170,12 @@ function profile_content(&$a, $update = 0) {
$lockstate = 'unlock';
$o .= replace_macros($tpl,array(
'$baseurl' => $a->get_baseurl(),
- '$defloc' => (($_SESSION['uid'] == $a->profile['profile_uid']) ? $a->user['default-location'] : ''),
+ '$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,
'$bang' => '',
- '$acl' => (($_SESSION['uid'] == $a->profile['profile_uid']) ? populate_acl($a->user) : ''),
+ '$acl' => (($is_owner) ? populate_acl($a->user, $celeb) : ''),
'$profile_uid' => $a->profile['profile_uid']
));
}
@@ -167,25 +183,22 @@ function profile_content(&$a, $update = 0) {
// 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'])) {
+ 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
$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['profile_uid'])) {
+ if($is_owner) {
$sql_extra = '';
// Oh - while we're here... reset the Unseen messages
@@ -234,8 +247,8 @@ function profile_content(&$a, $update = 0) {
$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
@@ -249,7 +262,6 @@ function profile_content(&$a, $update = 0) {
);
-
$cmnt_tpl = load_view_file('view/comment_item.tpl');
$like_tpl = load_view_file('view/like.tpl');
@@ -270,30 +282,13 @@ function profile_content(&$a, $update = 0) {
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'] . '';
- }
+ like_puller($a,$item,$alike,'like');
+ like_puller($a,$item,$dlike,'dislike');
}
foreach($r as $item) {
-
+ $sparkle = '';
$comment = '';
$likebuttons = '';
@@ -301,9 +296,15 @@ function profile_content(&$a, $update = 0) {
$redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
- if((($item['verb'] == ACTIVITY_LIKE) || ($item['verb'] == ACTIVITY_DISLIKE)) && ($item['id'] != $item['parent']))
+ if(((activity_match($item['verb'],ACTIVITY_LIKE)) || (activity_match($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['profile_uid'])) {
if($item['id'] == $item['parent']) {
$likebuttons = replace_macros($like_tpl,array('$id' => $item['id']));
@@ -316,7 +317,7 @@ function profile_content(&$a, $update = 0) {
'$parent' => $item['parent'],
'$profile_uid' => $a->profile['profile_uid'],
'$mylink' => $contact['url'],
- '$mytitle' => t('Me'),
+ '$mytitle' => t('This is you'),
'$myphoto' => $contact['thumb'],
'$ww' => ''
));
@@ -330,9 +331,12 @@ function profile_content(&$a, $update = 0) {
// I can go directly to their profile as an authenticated guest.
if(local_user() && ($item['contact-uid'] == $_SESSION['uid'])
- && ($item['rel'] == REL_VIP || $item['rel'] == REL_BUD) && (! $item['self'] ))
+ && ($item['network'] === 'dfrn') && (! $item['self'] )) {
$profile_url = $redirect_url;
-
+ $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
@@ -345,25 +349,34 @@ function profile_content(&$a, $update = 0) {
$drop = '';
$dropping = false;
- if(($item['contact-id'] == $_SESSION['visitor_id']) || ($item['uid'] == $_SESSION['uid']))
+ if(($item['contact-id'] == remote_user()) || ($item['uid'] == local_user()))
$dropping = true;
$drop = replace_macros((($dropping)? $droptpl : $fakedrop), 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']) : '');
-
+ $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']),
- '$location' => (($item['location']) ? '' . $item['location'] . '' : ''),
+ '$lock' => $lock,
+ '$location' => $location,
'$indent' => (($item['parent'] != $item['item_id']) ? ' comment' : ''),
'$drop' => $drop,
'$like' => $like,
