diff options
Diffstat (limited to 'mod')
| -rwxr-xr-x | mod/cal.php | 3 | ||||
| -rw-r--r-- | mod/group.php | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/mod/cal.php b/mod/cal.php index 1e2405cd0..453f46f69 100755 --- a/mod/cal.php +++ b/mod/cal.php @@ -80,6 +80,8 @@ function cal_content(&$a) { $o = ''; + $tabs = profile_tabs($a, True, $channel['channel_address']); + $mode = 'view'; $y = 0; $m = 0; @@ -333,6 +335,7 @@ function cal_content(&$a) { '$today' => t('Today'), '$form' => $form, '$expandform' => ((x($_GET,'expandform')) ? true : false), + '$tabs' => $tabs )); if (x($_GET,'id')){ echo $o; killme(); } diff --git a/mod/group.php b/mod/group.php index 7eaad771f..c63ccfa9b 100644 --- a/mod/group.php +++ b/mod/group.php @@ -117,7 +117,7 @@ function group_content(&$a) { check_form_security_token_ForbiddenOnErr('group_member_change', 't'); - $r = q("SELECT abook_xchan from abook left join xchan on abook_xchan = xchan_hash where abook_xchan = '%s' and abook_channel = %d and xchan_deleted = 0 and abook_blocked = 0 and abook_pending = 0 limit 1", + $r = q("SELECT abook_xchan from abook left join xchan on abook_xchan = xchan_hash where abook_xchan = '%s' and abook_channel = %d and xchan_deleted = 0 and abook_self = 0 and abook_blocked = 0 and abook_pending = 0 limit 1", dbesc(base64url_decode(argv(2))), intval(local_channel()) ); @@ -208,7 +208,7 @@ function group_content(&$a) { group_rmv_member(local_channel(),$group['name'],$member['xchan_hash']); } - $r = q("SELECT abook.*, xchan.* FROM `abook` left join xchan on abook_xchan = xchan_hash WHERE `abook_channel` = %d AND abook_blocked = 0 and abook_pending = 0 and xchan_deleted = 0 order by xchan_name asc", + $r = q("SELECT abook.*, xchan.* FROM `abook` left join xchan on abook_xchan = xchan_hash WHERE `abook_channel` = %d AND abook_self = 0 and abook_blocked = 0 and abook_pending = 0 and xchan_deleted = 0 order by xchan_name asc", intval(local_channel()) ); |