diff options
| author | Mario Vavti <mario@mariovavti.com> | 2015-07-15 14:03:34 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2015-07-15 14:03:34 +0200 |
| commit | 0c77a127f2e10bcea23e49d5eef61ce444046b31 (patch) | |
| tree | 4dd8c2e1df76510e59aa57a306de4960a2e36781 /mod/connedit.php | |
| parent | 5487b22dd79f9fd4e989db555fdd42d87aa77320 (diff) | |
| download | volse-hubzilla-0c77a127f2e10bcea23e49d5eef61ce444046b31.tar.gz volse-hubzilla-0c77a127f2e10bcea23e49d5eef61ce444046b31.tar.bz2 volse-hubzilla-0c77a127f2e10bcea23e49d5eef61ce444046b31.zip | |
show inherited state in Connection Default Permissions
Diffstat (limited to 'mod/connedit.php')
| -rw-r--r-- | mod/connedit.php | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/mod/connedit.php b/mod/connedit.php index f628fb9d3..129c07bd3 100644 --- a/mod/connedit.php +++ b/mod/connedit.php @@ -644,13 +644,17 @@ function connedit_content(&$a) { foreach($global_perms as $k => $v) { $thisperm = (($contact['abook_my_perms'] & $v[1]) ? "1" : ''); + $checkinherited = ((($channel[$v[0]]) && ($channel[$v[0]] != PERMS_SPECIFIC)) ? "1" : ''); + // For auto permissions (when $self is true) we don't want to look at existing // permissions because they are enabled for the channel owner 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], $checkinherited); } $o .= replace_macros($tpl,array( @@ -661,7 +665,7 @@ function connedit_content(&$a) { '$addr_text' => t('This connection\'s address is'), '$notself' => (($self) ? '' : '1'), '$self' => (($self) ? '1' : ''), - '$autolbl' => t('Apply the permissions indicated on this page to all new connections.'), + '$autolbl' => t('The permissions indicated on this page will be applied to all new connections.'), '$buttons' => (($self) ? '' : $buttons), '$lbl_slider' => t('Slide to adjust your degree of friendship'), '$lbl_rating' => t('Rating'), @@ -693,6 +697,7 @@ function connedit_content(&$a) { '$perms' => $perms, '$permlbl' => t('Individual Permissions'), '$permnote' => t('Some permissions may be inherited from your channel\'s <a href="settings"><strong>privacy settings</strong></a>, which have higher priority than individual settings. You can <strong>not</strong> change those settings here.'), + '$permnote_self' => t('Some permissions may be inherited from your channel\'s <a href="settings"><strong>privacy settings</strong></a>, which have higher priority than individual settings. You can change those settings here but they wont have any impact unless the inherited setting changes.'), '$lastupdtext' => t('Last update:'), '$last_update' => relative_date($contact['abook_connected']), '$profile_select' => contact_profile_assign($contact['abook_profile']), |