From 711dd1468db2116a2003494d4fe6d8a7c5ed7c7b Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 14 Jul 2015 13:16:08 +0200 Subject: provide inherited perms for connection default permissions --- mod/connedit.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mod/connedit.php b/mod/connedit.php index 39a69364d..a72714a1d 100644 --- a/mod/connedit.php +++ b/mod/connedit.php @@ -650,9 +650,11 @@ function connedit_content(&$a) { if((! $self) && ($existing[$k])) $thisperm = "1"; - $perms[] = array('perms_' . $k, $v[3], (($contact['abook_their_perms'] & $v[1]) ? "1" : ""),$thisperm, $v[1], (($channel[$v[0]] == PERMS_SPECIFIC || $self) ? '' : '1'), $v[4]); + $perms[] = array('perms_' . $k, $v[3], (($contact['abook_their_perms'] & $v[1]) ? "1" : ""),$thisperm, $v[1], (($channel[$v[0]] == PERMS_SPECIFIC) ? '' : '1'), $v[4]); } + //print_r($perms); killme(); + $o .= replace_macros($tpl,array( '$header' => (($self) ? t('Connection Default Permissions') : sprintf( t('Connection: %s'),$contact['xchan_name'])), -- cgit v1.2.3