- if(($a->module != 'home') && (! (x($_SESSION['uid']))))
- $a->page['nav'] .= '<a id="nav-home-link" class="nav-commlink" href="">' . t('Home') . "</a>\r\n";
-
- $a->page['nav'] .= '<a id="nav-directory-link" class="nav-link" href="directory">' . t('Site Directory') . "</a>\r\n";
+ /**
+ * "Home" should also take you home from an authenticated 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="' . $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";
+
+ $a->page['nav'] .= '<a id="nav-search-link" class="nav-link" href="search">' . t('Search') . "</a>\r\n";
+ $a->page['nav'] .= '<a id="nav-directory-link" class="nav-link" href="directory">' . t('Directory') . "</a>\r\n";
+
+
+ /**
+ *
+ * The following nav links are only show to logged in users
+ *
+ */