harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

do not allow/show acl button on photo edit if not owner

Browse Source
This commit is contained in:
Mario Vavti 2015-06-15 13:04:16 +02:00
parent 187a7a56c2
commit 905cd1da5b
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mod/photos.php
View File

@ -539,7 +539,7 @@ function photos_content(&$a) {
$lockstate = (($channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'); $lockstate = (($channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock');
} }
$aclselect_e = (($_is_owner) ? populate_acl($channel_acl,false) : ''); $aclselect = (($_is_owner) ? populate_acl($channel_acl,false) : '');
$selname = (($datum) ? hex2bin($datum) : ''); $selname = (($datum) ? hex2bin($datum) : '');
@ -557,7 +557,7 @@ function photos_content(&$a) {
'$albums' => $albums['albums'], '$albums' => $albums['albums'],
'$selname' => $selname, '$selname' => $selname,
'$permissions' => t('Permissions'), '$permissions' => t('Permissions'),
'$aclselect' => $aclselect_e, '$aclselect' => $aclselect,
'$lockstate' => $lockstate, '$lockstate' => $lockstate,
'$uploader' => $ret['addon_text'], '$uploader' => $ret['addon_text'],
'$default' => (($ret['default_upload']) ? true : false), '$default' => (($ret['default_upload']) ? true : false),
@ -900,7 +900,7 @@ function photos_content(&$a) {
if($can_post) { if($can_post) {
$album_e = $ph[0]['album']; $album_e = $ph[0]['album'];
$caption_e = $ph[0]['description']; $caption_e = $ph[0]['description'];
$aclselect_e = populate_acl($ph[0]); $aclselect_e = (($_is_owner) ? populate_acl($ph[0]) : '');
$albums = ((array_key_exists('albums', $a->data)) ? $a->data['albums'] : photos_albums_list($a->data['channel'],$a->data['observer'])); $albums = ((array_key_exists('albums', $a->data)) ? $a->data['albums'] : photos_albums_list($a->data['channel'],$a->data['observer']));
$_SESSION['album_return'] = bin2hex($ph[0]['album']); $_SESSION['album_return'] = bin2hex($ph[0]['album']);

2
view/tpl/field_checkbox.tpl
View File

@ -1,4 +1,4 @@
<div class="form-group field checkbox"> <div id="{{$field.0}}_container" class="form-group field checkbox">
<label for="id_{{$field.0}}">{{$field.1}}</label> <label for="id_{{$field.0}}">{{$field.1}}</label>
<div class="pull-right"><input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="1" {{if $field.2}}checked="checked"{{/if}} {{if $field.5}}{{$field.5}}{{/if}} /><label class="switchlabel" for='id_{{$field.0}}'> <span class="onoffswitch-inner" data-on='{{if $field.4}}{{$field.4.1}}{{/if}}' data-off='{{if $field.4}}{{$field.4.0}}{{/if}}'></span><span class="onoffswitch-switch"></span></label></div> <div class="pull-right"><input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="1" {{if $field.2}}checked="checked"{{/if}} {{if $field.5}}{{$field.5}}{{/if}} /><label class="switchlabel" for='id_{{$field.0}}'> <span class="onoffswitch-inner" data-on='{{if $field.4}}{{$field.4.1}}{{/if}}' data-off='{{if $field.4}}{{$field.4.0}}{{/if}}'></span><span class="onoffswitch-switch"></span></label></div>
<span class="help-block">{{$field.3}}</span> <span class="help-block">{{$field.3}}</span>

2
view/tpl/photo_view.tpl
View File

@ -79,9 +79,11 @@
<button class="btn btn-danger btn-sm" id="photo-edit-delete-button" type="submit" name="delete" value="{{$edit.delete}}" onclick="return confirmDelete();" />{{$edit.delete}}</button> <button class="btn btn-danger btn-sm" id="photo-edit-delete-button" type="submit" name="delete" value="{{$edit.delete}}" onclick="return confirmDelete();" />{{$edit.delete}}</button>
</div> </div>
<div class="form-group btn-group pull-right"> <div class="form-group btn-group pull-right">
{{if $edit.aclselect}}
<button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;"> <button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
<i id="jot-perms-icon" class="icon-{{$edit.lockstate}}"></i> <i id="jot-perms-icon" class="icon-{{$edit.lockstate}}"></i>
</button> </button>
{{/if}}
<button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit" >{{$edit.submit}}</button> <button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit" >{{$edit.submit}}</button>
</div> </div>
</form> </form>