aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-01-05 01:53:34 -0800
committerFriendika <info@friendika.com>2011-01-05 01:53:34 -0800
commit1b0ddc928d2dbeeeab80d6beec1abc0e7a29bdb5 (patch)
treed43f182f20aa799879dad7756f2046611a30ffe7
parentf257569713aa61b8510e6205a490eeae9c11ba5c (diff)
downloadvolse-hubzilla-1b0ddc928d2dbeeeab80d6beec1abc0e7a29bdb5.tar.gz
volse-hubzilla-1b0ddc928d2dbeeeab80d6beec1abc0e7a29bdb5.tar.bz2
volse-hubzilla-1b0ddc928d2dbeeeab80d6beec1abc0e7a29bdb5.zip
make home tab work from remote profile, fix link in comment notify emails
-rw-r--r--include/nav.php6
-rw-r--r--index.php3
-rw-r--r--mod/dfrn_notify.php2
3 files changed, 9 insertions, 2 deletions
diff --git a/include/nav.php b/include/nav.php
index 74b4defc3..1bde702be 100644
--- 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 456c0a144..38684a00a 100644
--- 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 e4aabba5a..49356d358 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'])))
));