mirror of
https://github.com/friendica/friendica
synced 2025-04-27 05:50:10 +00:00
sorting out visitor sessions
This commit is contained in:
parent
56a37deb73
commit
059e090b53
8 changed files with 158 additions and 129 deletions
|
@ -43,12 +43,6 @@ 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 {
|
||||
|
@ -57,6 +51,15 @@ function profile_init(&$a) {
|
|||
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'] .= "<meta name=\"dfrn-template\" content=\"" . $a->get_baseurl() . "/profile/%s" . "\" />\r\n";
|
||||
|
||||
|
@ -79,9 +82,9 @@ function item_display(&$a, $item,$template,$comment) {
|
|||
|
||||
$o .= replace_macros($template,array(
|
||||
'$id' => $item['item_id'],
|
||||
'$profile_url' => $profile_url,
|
||||
'$name' => $item['name'],
|
||||
'$thumb' => $thumb,
|
||||
'$profile_url' => ((strlen($item['remote-link'])) ? $item['remote-link'] : $profile_url),
|
||||
'$name' => ((strlen($item['remote-name'])) ? $item['remote-name'] : $item['name']),
|
||||
'$thumb' => ((strlen($item['remote-avatar'])) ? $item['remote-avatar'] : $thumb),
|
||||
'$body' => bbcode($item['body']),
|
||||
'$ago' => relative_date($item['created']),
|
||||
'$indent' => (($item['parent'] != $item['item_id']) ? 'comment-' : ''),
|
||||
|
@ -196,7 +199,7 @@ function profile_content(&$a) {
|
|||
|
||||
if(count($r))
|
||||
$a->set_pager_total($r[0]['total']);
|
||||
|
||||
dbg(2);
|
||||
|
||||
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
|
||||
`contact`.`name`, `contact`.`photo`, `contact`.`url`,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue