provide inherited perms for connection default permissions

This commit is contained in:
Mario Vavti 2015-07-14 13:16:08 +02:00
parent a28da40fa8
commit 711dd1468d

View File

@ -650,9 +650,11 @@ function connedit_content(&$a) {
if((! $self) && ($existing[$k])) if((! $self) && ($existing[$k]))
$thisperm = "1"; $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( $o .= replace_macros($tpl,array(
'$header' => (($self) ? t('Connection Default Permissions') : sprintf( t('Connection: %s'),$contact['xchan_name'])), '$header' => (($self) ? t('Connection Default Permissions') : sprintf( t('Connection: %s'),$contact['xchan_name'])),