diff --git a/include/nav.php b/include/nav.php index 74b4defc38..1bde702bef 100644 --- a/include/nav.php +++ b/include/nav.php @@ -15,8 +15,12 @@ $a->page['nav'] .= "\r\n"; + // This should take you home from a remote profile connection + + $homelink = ((x($_SESSION,'visitor_home')) ? $_SESSION['visitor_home'] : ''); + if(($a->module != 'home') && (! (local_user()))) - $a->page['nav'] .= '' . t('Home') . "\r\n"; + $a->page['nav'] .= '' . t('Home') . "\r\n"; if(($a->config['register_policy'] == REGISTER_OPEN) && (! local_user()) && (! remote_user())) $a->page['nav'] .= '' . t('Register') . "\r\n"; diff --git a/index.php b/index.php index 456c0a1443..38684a00a0 100644 --- a/index.php +++ b/index.php @@ -183,6 +183,9 @@ elseif(local_user()) if(isset($homebase)) $a->page['content'] .= ''; +// now that we've been through the module content, see if the page reported +// a permission problem and if so, a 403 response would seem to be in order. + if(stristr($_SESSION['sysmsg'], t('Permission denied'))) { header($_SERVER["SERVER_PROTOCOL"] . ' 403 ' . t('Permission denied.')); } diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php index e4aabba5a1..49356d358c 100644 --- a/mod/dfrn_notify.php +++ b/mod/dfrn_notify.php @@ -363,7 +363,7 @@ function dfrn_notify_post(&$a) { '$username' => $importer['username'], '$email' => $importer['email'], '$from' => $from, - '$display' => $a->get_baseurl() . '/display/' . $r, + '$display' => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $r, '$body' => strip_tags(bbcode(stripslashes($datarray['body']))) ));