make home tab work from remote profile, fix link in comment notify emails

This commit is contained in:
Friendika 2011-01-05 01:53:34 -08:00
parent f257569713
commit 1b0ddc928d
3 changed files with 9 additions and 2 deletions

View file

@ -15,8 +15,12 @@
$a->page['nav'] .= "<span id=\"nav-link-wrapper\" >\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'] .= '<a id="nav-home-link" class="nav-commlink" href="">' . t('Home') . "</a>\r\n";
$a->page['nav'] .= '<a id="nav-home-link" class="nav-commlink" href="' . $homelink . '">' . t('Home') . "</a>\r\n";
if(($a->config['register_policy'] == REGISTER_OPEN) && (! local_user()) && (! remote_user()))
$a->page['nav'] .= '<a id="nav-register-link" class="nav-commlink" href="register" >'
. t('Register') . "</a>\r\n";

View file

@ -183,6 +183,9 @@ elseif(local_user())
if(isset($homebase))
$a->page['content'] .= '<script>var homebase="' . $homebase . '" ; </script>';
// 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.'));
}

View file

@ -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'])))
));