X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fprofile.php;h=3703fe7f26c6f49d09dda271295d67fc5edf9a08;hb=6d7b0182376d6ce0cfa2c4e01500ff321b9e9b51;hp=5a1ac06391c9c048cb32d42bdec940a4ea2e67c7;hpb=c6267a2cd2e3a731f44df9288ced508ad90c4ca3;p=friendica.git
diff --git a/mod/profile.php b/mod/profile.php
index 5a1ac06391..3703fe7f26 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -1,11 +1,7 @@
error = 404;
return;
}
@@ -43,20 +40,23 @@ function profile_load(&$a,$uid,$profile = 0) {
function profile_init(&$a) {
- if($_SESSION['authenticated']) {
-
- // choose which page to show (could be remote auth)
-
- }
-
if($a->argc > 1)
$which = $a->argv[1];
else {
- $_SESSION['sysmsg'] .= "No profile" . EOL ;
+ notice("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_load($a,$which);
$a->page['htmlhead'] .= "get_baseurl() . "/profile/%s" . "\" />\r\n";
@@ -66,51 +66,18 @@ function profile_init(&$a) {
}
-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'] ;
-
- $photo = (($item['self']) ? $a->profile['photo'] : $item['photo']);
- $thumb = (($item['self']) ? $a->profile['thumb'] : $item['thumb']);
-
- $o .= replace_macros($template,array(
- '$id' => $item['item_id'],
- '$profile_url' => $profile_url,
- '$name' => $item['name'],
- '$thumb' => $thumb,
- '$body' => bbcode($item['body']),
- '$ago' => relative_date($item['created']),
- '$indent' => (($item['parent'] != $item['item_id']) ? 'comment-' : ''),
- '$comment' => $comment
- ));
-
-
- return $o;
-}
-
-
-function profile_content(&$a) {
+function profile_content(&$a, $update = false) {
require_once("include/bbcode.php");
require_once('include/security.php');
- $a->page['htmlhead'] .= '';
$groups = array();
$tab = 'posts';
- if(x($_GET,'tab'))
- $tab = notags(trim($_GET['tab']));
- $tpl = file_get_contents('view/profile_tabs.tpl');
- $o .= replace_macros($tpl,array(
- '$url' => $a->get_baseurl() . '/' . $a->cmd
- ));
if(remote_user()) {
@@ -118,52 +85,86 @@ function profile_content(&$a) {
$groups = init_groups_visitor($contact_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'];
+ $contact_id = $_SESSION['cid'];
}
- if($tab == 'profile') {
-
- require_once('view/profile_advanced.php');
-
- return $o;
+ if($update) {
+ // Ensure we've got a profile owner if updating.
+ if(remote_user()) {
+ $r = q("SELECT `uid` FROM `contact` WHERE `id` = %d LIMIT 1",
+ intval($_SESSION['visitor_id'])
+ );
+ if(count($r))
+ $a->profile['uid'] = $r[0]['uid'];
+ else
+ killme();
+ }
+ elseif(local_user()) {
+ $a->profile['uid'] = $_SESSION['uid'];
+ }
+ else {
+ killme();
+ return; // NOTREACHED
+ }
}
- if(can_write_wall($a,$a->profile['profile_uid'])) {
- $tpl = file_get_contents('view/jot-header.tpl');
-
- $a->page['htmlhead'] .= replace_macros($tpl, array('$baseurl' => $a->get_baseurl()));
- require_once('view/acl_selectors.php');
- $tpl = file_get_contents("view/jot.tpl");
+ else {
+ if(x($_GET,'tab'))
+ $tab = notags(trim($_GET['tab']));
+
+ $tpl = file_get_contents('view/profile_tabs.tpl');
$o .= replace_macros($tpl,array(
- '$baseurl' => $a->get_baseurl(),
- '$visitor' => (($_SESSION['uid'] == $a->profile['profile_uid']) ? 'block' : 'none'),
- '$lockstate' => 'unlock',
- '$acl' => (($_SESSION['uid'] == $a->profile['profile_uid']) ? populate_acl() : ''),
- '$profile_uid' => $a->profile['profile_uid']
+ '$url' => $a->get_baseurl() . '/' . $a->cmd
));
- }
- // TODO
- // Alter registration and settings
- // and profile to update contact table when names and photos change.
- // work on item_display and can_write_wall
+ if($tab == 'profile') {
+ require_once('view/profile_advanced.php');
+ return $o;
+ }
+
+ if(can_write_wall($a,$a->profile['profile_uid'])) {
+ $tpl = file_get_contents('view/jot-header.tpl');
+
+ $a->page['htmlhead'] .= replace_macros($tpl, array('$baseurl' => $a->get_baseurl()));
+ require_once('view/acl_selectors.php');
+
+ $tpl = file_get_contents("view/jot.tpl");
+
+ $o .= replace_macros($tpl,array(
+ '$baseurl' => $a->get_baseurl(),
+ '$return_path' => $a->cmd,
+ '$visitor' => (($_SESSION['uid'] == $a->profile['profile_uid']) ? 'block' : 'none'),
+ '$lockstate' => 'unlock',
+ '$acl' => (($_SESSION['uid'] == $a->profile['profile_uid']) ? populate_acl() : ''),
+ '$profile_uid' => $a->profile['profile_uid']
+ ));
+ }
+
+ if($tab == 'posts' && (! $a->pager['start']))
+ $o .= '' . "\r\n";
+ }
- // Add comments.
+ // TODO alter registration and settings and profile to update contact table when names and photos change.
- // default - anonymous user
+ // 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(local_user() && ($_SESSION['uid'] == $a->profile['uid'])) {
$sql_extra = '';
+
+ // Oh - while we're here... reset the Unseen messages
+
+ $r = q("UPDATE `item` SET `unseen` = 0
+ WHERE `type` != 'remote' AND `unseen` = 1 AND `uid` = %d",
+ intval($_SESSION['uid'])
+ );
+
+ }
// authenticated visitor - here lie dragons
elseif(remote_user()) {
@@ -174,9 +175,9 @@ function profile_content(&$a) {
}
$sql_extra = sprintf(
" AND ( `allow_cid` = '' OR `allow_cid` REGEXP '<%d>' )
- AND ( `deny_cid` = '' OR NOT `deny_cid` REGEXP '<%d>' )
- AND ( `allow_gid` = '' OR `allow_gid` REGEXP '%s' )
- AND ( `deny_gid` = '' OR NOT `deny_gid` REGEXP '%s') ",
+ AND ( `deny_cid` = '' OR NOT `deny_cid` REGEXP '<%d>' )
+ AND ( `allow_gid` = '' OR `allow_gid` REGEXP '%s' )
+ AND ( `deny_gid` = '' OR NOT `deny_gid` REGEXP '%s') ",
intval($_SESSION['visitor_id']),
intval($_SESSION['visitor_id']),
@@ -188,7 +189,7 @@ function profile_content(&$a) {
$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 `contact`.`blocked` = 0
+ AND NOT `item`.`type` IN ( 'remote', 'net-comment') AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
$sql_extra ",
intval($a->profile['uid'])
@@ -204,7 +205,7 @@ function profile_content(&$a) {
`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 `contact`.`blocked` = 0
+ AND NOT `item`.`type` IN ( 'remote', 'net-comment') AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
$sql_extra
ORDER BY `parent` DESC, `id` ASC LIMIT %d ,%d ",
intval($a->profile['uid']),
@@ -214,29 +215,87 @@ function profile_content(&$a) {
);
- $template = file_get_contents('view/comment_item.tpl');
-
+ $cmnt_tpl = file_get_contents('view/comment_item.tpl');
$tpl = file_get_contents('view/wall_item.tpl');
+
+ if($update)
+ $return_url = $_SESSION['return_url'];
+ else
+ $return_url = $_SESSION['return_url'] = $a->cmd;
+
if(count($r)) {
- foreach($r as $rr) {
+ foreach($r as $item) {
$comment = '';
- if(can_write_wall($a,$a->profile['profile_uid'])) {
- if($rr['last-child']) {
- $comment = replace_macros($template,array(
- '$id' => $rr['item_id'],
- '$parent' => $rr['parent'],
- '$profile_uid' => $a->profile['profile_uid']
+ $template = $tpl;
+
+ $redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
+
+
+
+ if(can_write_wall($a,$a->profile['uid'])) {
+ 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'],
+ '$ww' => ''
));
}
}
- $o .= item_display($a,$rr,$tpl,$comment);
+
+
+ $profile_url = $item['url'];
+
+ // 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'] ))
+ $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
+ // known to us and is reflected in the contact-id for this item. We can use the contact url or redirect rather than
+ // use the link in the feed. This is different than on the network page where we may not know the author.
+
+ $profile_name = ((strlen($item['author-name'])) ? $item['author-name'] : $item['name']);
+ $profile_avatar = ((strlen($item['author-avatar'])) ? $item['author-avatar'] : $item['thumb']);
+ $profile_link = $profile_url;
+
+ $drop = '';
+
+ 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']));
+
+
+
+
+ $o .= replace_macros($template,array(
+ '$id' => $item['item_id'],
+ '$profile_url' => $profile_link,
+ '$name' => $profile_name,
+ '$thumb' => $profile_avatar,
+ '$body' => bbcode($item['body']),
+ '$ago' => relative_date($item['created']),
+ '$indent' => (($item['parent'] != $item['item_id']) ? ' comment' : ''),
+ '$drop' => $drop,
+ '$comment' => $comment
+ ));
}
}
+ if($update) {
+ return $o;
+ }
+
$o .= paginate($a);
return $o;
-
-
}
\ No newline at end of file