X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fprofile.php;h=bb7357e5b7e70e1aefd9bb94cee15160c24cf2d5;hb=91fd83575416f0e098ce7a9e71c12e5fea3298d3;hp=c0321e620e4e3f588c86f43550c96885226898c2;hpb=b9bbe0cec290e9d5c3363ff272aa89de4716345d;p=friendica.git diff --git a/mod/profile.php b/mod/profile.php index c0321e620e..bb7357e5b7 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,120 +66,188 @@ 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']), - '$comment' => $comment - )); - - - return $o; -} - - function profile_content(&$a) { require_once("include/bbcode.php"); require_once('include/security.php'); + $groups = array(); + $tab = 'posts'; if(x($_GET,'tab')) $tab = notags(trim($_GET['tab'])); -// $tpl = file_get_contents('view/profile_tabs.tpl'); + $tpl = file_get_contents('view/profile_tabs.tpl'); + + $o .= replace_macros($tpl,array( + '$url' => $a->get_baseurl() . '/' . $a->cmd + )); - if(remote_user()) + if(remote_user()) { $contact_id = $_SESSION['visitor_id']; + $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(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($a->profile['is-default']) { + // TODO alter registration and settings and profile to update contact table when names and photos change. + + // default permissions - anonymous user + + $sql_extra = " AND `allow_cid` = '' AND `allow_gid` = '' AND `deny_cid` = '' AND `deny_gid` = '' "; - // TODO left join with contact which will carry names and photos. (done)Store local users in contact as well as user.(done) - // Alter registration and settings - // and profile to update contact table when names and photos change. - // work on item_display and can_write_wall + // Profile owner - everything is visible - // Add comments. + if(local_user() && ($_SESSION['uid'] == $a->profile['profile_uid'])) { + $sql_extra = ''; + + // Oh - while we're here... reset the Unseen messages - $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 - AND `allow_uid` = '' AND `allow_gid` = '' AND `deny_uid` = '' AND `deny_gid` = '' - GROUP BY `item`.`parent`, `item`.`id` - ORDER BY `created` DESC LIMIT 0,30 ", - intval($a->profile['uid']) + $r = q("UPDATE `item` SET `unseen` = 0 + WHERE `type` != 'remote' AND `unseen` = 1 AND `uid` = %d", + intval($_SESSION['uid']) ); - $template = file_get_contents('view/comment_item.tpl'); + } + + // authenticated visitor - here lie dragons + elseif(remote_user()) { + $gs = '<<>>'; // should be impossible to match + if(count($groups)) { + foreach($groups as $g) + $gs .= '|<' . intval($g) . '>'; + } + $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') ", + + intval($_SESSION['visitor_id']), + intval($_SESSION['visitor_id']), + dbesc($gs), + dbesc($gs) + ); + } + $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 `item`.`type` != 'remote' AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 + $sql_extra ", + intval($a->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`.`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 `item`.`type` != 'remote' AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 + $sql_extra + ORDER BY `parent` DESC, `id` ASC LIMIT %d ,%d ", + intval($a->profile['uid']), + intval($a->pager['start']), + intval($a->pager['itemspage']) + + ); + $cmnt_tpl = file_get_contents('view/comment_item.tpl'); - $tpl = file_get_contents('view/wall_item.tpl'); + $tpl = file_get_contents('view/wall_item.tpl'); - if(count($r)) { - foreach($r as $rr) { - if(can_write_wall($a,$a->profile['profile_uid'])) { - $comment = replace_macros($template,array( - '$id' => $rr['item_id'], - '$profile_uid' => $a->profile['profile_uid'] + + if(count($r)) { + foreach($r as $item) { + $comment = ''; + $template = $tpl; + + $redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ; + + if(can_write_wall($a,$a->profile['profile_uid'])) { + if($item['last-child']) { + $comment = replace_macros($cmnt_tpl,array( + '$return_path' => $a->cmd, + '$id' => $item['item_id'], + '$parent' => $item['parent'], + '$profile_uid' => $a->profile['profile_uid'], + '$ww' => '' )); } - else { - $comment = ''; - } - - $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; + + $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-' : ''), + '$comment' => $comment + )); } } - return $o; - + $o .= paginate($a); + return $o; } \ No newline at end of file