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

diff --git a/include/nav.php b/include/nav.php
index 74b4defc38f453b38224df164c682da4633a9342..1bde702bef08ec7c23495b83d612c6965b1019ed 100644 (file)
--- a/include/nav.php
+++ b/include/nav.php
@@ -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";

diff --git a/index.php b/index.php
index 456c0a144335ec68e1a1936a698fff2af311a18d..38684a00a00953e19c4c2f185fd292006133a9b0 100644 (file)
--- a/index.php
+++ b/index.php
@@ -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.'));
 }

diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index e4aabba5a1626af7a7b293e4790e20384b910253..49356d358c4cd2d217006bca20dad413571d44c6 100644 (file)
--- 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'])))
                                                        ));