diff options
| author | zotlabs <mike@macgirvin.com> | 2017-11-08 19:22:09 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-11-08 19:22:09 -0800 |
| commit | 909f67fb3a53461ce0010a205121996297909051 (patch) | |
| tree | 143186140e12020da2b67bf3b137d4899012d201 /include | |
| parent | 92e0c502f76f5a3acc0498f45a0fe836973c554c (diff) | |
| parent | e7d20efb1b8d579bcb9bdef99205aad19281f6b2 (diff) | |
| download | volse-hubzilla-909f67fb3a53461ce0010a205121996297909051.tar.gz volse-hubzilla-909f67fb3a53461ce0010a205121996297909051.tar.bz2 volse-hubzilla-909f67fb3a53461ce0010a205121996297909051.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/nav.php | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/include/nav.php b/include/nav.php index af0ebbae2..9df50c9fe 100644 --- a/include/nav.php +++ b/include/nav.php @@ -27,6 +27,8 @@ function nav($template = 'default') { </script> EOT; + $is_owner = (((local_channel()) && ((App::$profile_uid == local_channel()) || (App::$profile_uid == 0))) ? true : false); + if(local_channel()) { $channel = App::get_channel(); $observer = App::get_observer(); @@ -39,17 +41,17 @@ EOT; intval(get_account_id()) ); } + $sitelocation = (($is_owner) ? '' : App::$profile['reddress']); } - elseif(remote_channel()) + elseif(remote_channel()) { $observer = App::get_observer(); + $sitelocation = ((App::$profile['reddress']) ? App::$profile['reddress'] : '@' . App::get_hostname()); + } require_once('include/conversation.php'); - $is_owner = (((local_channel()) && ((App::$profile_uid == local_channel()) || (App::$profile_uid == 0))) ? true : false); + $channel_apps[] = channel_apps($is_owner, App::$profile['channel_address']); - $myident = (($channel) ? $channel['xchan_addr'] : ''); - - $sitelocation = (($myident) ? $myident : App::get_hostname()); /** * @@ -438,10 +440,10 @@ function channel_apps($is_owner = false, $nickname = null) { if($p['view_stream'] && $cal_link) { $tabs[] = [ - 'label' => t('Events'), + 'label' => t('Calendar'), 'url' => z_root() . $cal_link, - 'sel' => ((argv(0) == 'cal' || argv(0) == 'events') ? 'active' : ''), - 'title' => t('Events'), + 'sel' => ((argv(0) == 'cal') ? 'active' : ''), + 'title' => t('Calendar'), 'id' => 'event-tab', 'icon' => 'calendar' ]; |