diff options
| -rw-r--r-- | mod/connedit.php | 9 | ||||
| -rwxr-xr-x | util/add_addon_repo | 2 | ||||
| -rwxr-xr-x | util/add_theme_repo | 2 | ||||
| -rwxr-xr-x | util/add_widget_repo | 2 | ||||
| -rwxr-xr-x | util/update_addon_repo | 2 | ||||
| -rwxr-xr-x | util/update_theme_repo | 2 | ||||
| -rwxr-xr-x | util/update_widget_repo | 2 | ||||
| -rwxr-xr-x | view/tpl/abook_edit.tpl | 7 | ||||
| -rwxr-xr-x | view/tpl/field_acheckbox.tpl | 6 |
9 files changed, 19 insertions, 15 deletions
diff --git a/mod/connedit.php b/mod/connedit.php index 78d06c243..2340ce678 100644 --- a/mod/connedit.php +++ b/mod/connedit.php @@ -643,25 +643,25 @@ 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( '$header' => (($self) ? t('Connection Default Permissions') : sprintf( t('Connection: %s'),$contact['xchan_name'])), - '$autoperms' => array('autoperms',t('Apply these permissions automatically'), ((get_pconfig(local_channel(),'system','autoperms')) ? 1 : 0), '', array(t('No'),('Yes'))), + '$autoperms' => array('autoperms',t('Apply these permissions automatically'), ((get_pconfig(local_channel(),'system','autoperms')) ? 1 : 0), 'Connection requests will be approved without your interaction', array(t('No'),('Yes'))), '$addr' => $contact['xchan_addr'], '$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 +693,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']), diff --git a/util/add_addon_repo b/util/add_addon_repo index 4979c06bc..decd9e091 100755 --- a/util/add_addon_repo +++ b/util/add_addon_repo @@ -1,4 +1,4 @@ -#!/bin/sh -f +#!/bin/bash -f if [ $# -ne 2 ]; then echo usage: $0 repo_url nickname diff --git a/util/add_theme_repo b/util/add_theme_repo index 70a8c6432..d41eba6d9 100755 --- a/util/add_theme_repo +++ b/util/add_theme_repo @@ -1,4 +1,4 @@ -#!/bin/sh -f +#!/bin/bash -f if [ $# -ne 2 ]; then diff --git a/util/add_widget_repo b/util/add_widget_repo index 449afe5db..347e8e4e1 100755 --- a/util/add_widget_repo +++ b/util/add_widget_repo @@ -1,4 +1,4 @@ -#!/bin/sh -f +#!/bin/bash -f if [ $# -ne 2 ]; then echo usage: $0 repo_url nickname diff --git a/util/update_addon_repo b/util/update_addon_repo index 42bd3a71f..5b531e6a5 100755 --- a/util/update_addon_repo +++ b/util/update_addon_repo @@ -1,4 +1,4 @@ -#!/bin/sh -f +#!/bin/bash -f if [ $# -ne 1 ]; then echo usage: $0 repository diff --git a/util/update_theme_repo b/util/update_theme_repo index 443b26591..cd71531d0 100755 --- a/util/update_theme_repo +++ b/util/update_theme_repo @@ -1,4 +1,4 @@ -#!/bin/sh -f +#!/bin/bash -f if [ $# -ne 1 ]; then diff --git a/util/update_widget_repo b/util/update_widget_repo index c00c85708..045122619 100755 --- a/util/update_widget_repo +++ b/util/update_widget_repo @@ -1,4 +1,4 @@ -#!/bin/sh -f +#!/bin/bash -f if [ $# -ne 1 ]; then echo usage: $0 repository diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl index 71693a553..93f52be8d 100755 --- a/view/tpl/abook_edit.tpl +++ b/view/tpl/abook_edit.tpl @@ -176,7 +176,8 @@ <div id="perms-tool-collapse" class="panel-collapse collapse{{if $self}} in{{/if}}" role="tabpanel" aria-labelledby="perms-tool"> <div class="section-content-tools-wrapper"> <div class="section-content-warning-wrapper"> - {{$permnote}} + {{if $notself}}{{$permnote}}{{/if}} + {{if $self}}{{$permnote_self}}{{/if}} </div> <table id="perms-tool-table" class=form-group> @@ -194,7 +195,9 @@ {{if $self}} <div> - <div>{{$autolbl}}</div> + <div class="section-content-info-wrapper"> + {{$autolbl}} + </div> {{include file="field_checkbox.tpl" field=$autoperms}} </div> {{/if}} diff --git a/view/tpl/field_acheckbox.tpl b/view/tpl/field_acheckbox.tpl index d2aad3875..f96fd5fd6 100755 --- a/view/tpl/field_acheckbox.tpl +++ b/view/tpl/field_acheckbox.tpl @@ -1,6 +1,6 @@ <tr class="highlight"> <td> - <label class="mainlabel" for='id_{{$field.0}}'>{{$field.1}}</label><br> + <label class="mainlabel" for='me_id_{{$field.0}}'>{{$field.1}}</label><br> <span class='field_abook_help'>{{$field.6}}</span> </td> {{if $notself}} @@ -9,9 +9,9 @@ </td> {{/if}} <td class="abook-me"> - <input type="checkbox" name='{{$field.0}}' class='abook-edit-me' id='me_id_{{$field.0}}' value="{{$field.4}}" {{if $field.3}}checked="checked"{{/if}}{{if $field.5 && $notself}} disabled="disabled"{{/if}}/> + <input type="checkbox" name='{{$field.0}}' class='abook-edit-me' id='me_id_{{$field.0}}' value="{{$field.4}}" {{if $field.3}}checked="checked"{{/if}}{{if $notself && $field.5}} disabled="disabled"{{/if}}/> </td> <td> - {{if $field.5}}<span class="permission-inherited">{{$inherited}}</span>{{/if}} + {{if $field.5}}<span class="permission-inherited">{{$inherited}}{{if $self}}{{if $field.7}} <i class="icon-check"></i>{{else}} <i class="icon-check-empty"></i>{{/if}}{{/if}}</span>{{/if}} </td> </tr> |