diff options
| author | friendica <info@friendica.com> | 2014-04-06 03:47:53 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-04-06 03:47:53 -0700 |
| commit | 64dfe3ab64a7f39c2c88d141a7d8a8b9d60756ff (patch) | |
| tree | d7d10dfec58c11ee8b44feb2141b971c36c38532 | |
| parent | ad60e2c566930409d853517ca9392f169fc8e747 (diff) | |
| download | volse-hubzilla-64dfe3ab64a7f39c2c88d141a7d8a8b9d60756ff.tar.gz volse-hubzilla-64dfe3ab64a7f39c2c88d141a7d8a8b9d60756ff.tar.bz2 volse-hubzilla-64dfe3ab64a7f39c2c88d141a7d8a8b9d60756ff.zip | |
issue #395, item 2
| -rw-r--r-- | include/conversation.php | 6 | ||||
| -rw-r--r-- | include/reddav.php | 6 | ||||
| -rw-r--r-- | mod/bookmarks.php | 7 | ||||
| -rw-r--r-- | mod/chat.php | 6 | ||||
| -rwxr-xr-x | mod/events.php | 5 | ||||
| -rw-r--r-- | mod/webpages.php | 5 |
6 files changed, 26 insertions, 9 deletions
diff --git a/include/conversation.php b/include/conversation.php index 880639bf4..149da3ac7 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1472,6 +1472,8 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){ if (is_null($nickname)) $nickname = $channel['channel_address']; + + $uid = (($a->profile['profile_uid']) ? $a->profile['profile_uid'] : local_user()); if(x($_GET,'tab')) $tab = notags(trim($_GET['tab'])); @@ -1489,7 +1491,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){ ), ); - $p = get_all_perms($a->profile['profile_uid'],get_observer_hash()); + $p = get_all_perms($uid,get_observer_hash()); if($p['view_profile']) { $tabs[] = array( @@ -1550,7 +1552,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){ } - if($is_owner && feature_enabled($a->profile['profile_uid'],'webpages')) { + if($is_owner && feature_enabled($uid,'webpages')) { $tabs[] = array( 'label' => t('Webpages'), 'url' => $a->get_baseurl() . '/webpages/' . $nickname, diff --git a/include/reddav.php b/include/reddav.php index b7bb94fa0..7c14ca472 100644 --- a/include/reddav.php +++ b/include/reddav.php @@ -884,8 +884,12 @@ class RedBrowser extends DAV\Browser\Plugin { date_default_timezone_set($this->auth->timezone); $version = ''; + require_once('include/conversation.php'); - $html = " + if($this->auth->channel_name) + $html = profile_tabs(get_app(),(($this->auth->channel_id == local_user()) ? true : false),$this->auth->channel_name); + + $html .= " <body> <h1>Index for " . $this->escapeHTML($path) . "/</h1> <table> diff --git a/mod/bookmarks.php b/mod/bookmarks.php index 141ae2e0b..9ccc171fe 100644 --- a/mod/bookmarks.php +++ b/mod/bookmarks.php @@ -49,8 +49,13 @@ function bookmarks_content(&$a) { require_once('include/menu.php'); + require_once('include/conversation.php'); - $o = '<h3>' . t('My Bookmarks') . '</h3>'; + $channel = $a->get_channel(); + + $o = profile_tabs($a,true,$channel['channel_address']); + + $o .= '<h3>' . t('My Bookmarks') . '</h3>'; $x = menu_list(local_user(),'',MENU_BOOKMARK); diff --git a/mod/chat.php b/mod/chat.php index 0f2b94b9d..e007b50a8 100644 --- a/mod/chat.php +++ b/mod/chat.php @@ -145,6 +145,7 @@ function chat_content(&$a) { if(argc() > 2 && intval(argv(2))) { + $room_id = intval(argv(2)); $bookmark_link = get_bookmark_link($ob); @@ -210,12 +211,13 @@ function chat_content(&$a) { + require_once('include/conversation.php'); - + $o = profile_tabs($a,((local_user() && local_user() == $a->profile['profile_uid']) ? true : false)); require_once('include/widgets.php'); - $o = replace_macros(get_markup_template('chatrooms.tpl'), array( + $o .= replace_macros(get_markup_template('chatrooms.tpl'), array( '$header' => sprintf( t('%1$s\'s Chatrooms'), $a->profile['name']), '$baseurl' => z_root(), '$nickname' => $channel['channel_address'], diff --git a/mod/events.php b/mod/events.php index 2a6067e65..d243f61ba 100755 --- a/mod/events.php +++ b/mod/events.php @@ -163,7 +163,10 @@ function events_content(&$a) { $o =""; // tabs - $tabs = profile_tabs($a, True); + + $channel = $a->get_channel(); + + $tabs = profile_tabs($a, True, $channel['channel_address']); diff --git a/mod/webpages.php b/mod/webpages.php index 7e1b32f36..ac9012ce1 100644 --- a/mod/webpages.php +++ b/mod/webpages.php @@ -73,9 +73,10 @@ function webpages_content(&$a) { else $channel_acl = array(); + require_once('include/conversation.php'); + $o = profile_tabs($a,true); - - + $o .= '<h2>' . t('Webpages') . '</h2>'; $x = array( 'webpage' => ITEM_WEBPAGE, |