mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-19 23:35:12 +00:00
issue #395, item 2
This commit is contained in:
parent
ad60e2c566
commit
64dfe3ab64
6 changed files with 26 additions and 9 deletions
|
@ -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,
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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'],
|
||||
|
|
|
@ -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']);
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -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,
|
||||
|
|
Loading…
Reference in a new issue