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

bring back acl for cloud file uploads

Browse Source
This commit is contained in:
Mario Vavti 2016-08-06 12:46:10 +02:00
parent b6db0f72f5
commit 4f0b138692
4 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Zotlabs/Storage/Browser.php
View File

@ -279,7 +279,7 @@ class Browser extends DAV\Browser\Plugin {
$aclselect = null; $aclselect = null;
$lockstate = ''; $lockstate = '';
if($this->auth-owner_id) { if($this->auth->owner_id) {
$channel = channelx_by_n($this->auth->owner_id); $channel = channelx_by_n($this->auth->owner_id);
if($channel) { if($channel) {
$acl = new \Zotlabs\Access\AccessList($channel); $acl = new \Zotlabs\Access\AccessList($channel);
@ -330,6 +330,7 @@ class Browser extends DAV\Browser\Plugin {
'$deny_gid' => acl2json($channel_acl['deny_gid']), '$deny_gid' => acl2json($channel_acl['deny_gid']),
'$lockstate' => $lockstate, '$lockstate' => $lockstate,
'$return_url' => \App::$cmd, '$return_url' => \App::$cmd,
'$path' => str_replace('cloud/' . $this->auth->owner_nick . '/', '', $path),
'$dragdroptext' => t('Drop files here to immediately upload') '$dragdroptext' => t('Drop files here to immediately upload')
)); ));
} }

2
include/attach.php
View File

@ -1977,4 +1977,4 @@ function get_filename_by_cloudname($cloudname, $channel, $storepath) {
} }
} }
return null; return null;
} }

4
view/js/mod_cloud.js
View File

@ -202,7 +202,7 @@ function UploadFile(file, idx) {
}); });
// POST to the entire cloud path // POST to the entire cloud path
xhr.open('post', window.location.pathname, true); xhr.open('post', 'file_upload', true);
var formfields = $("#ajax-upload-files").serializeArray(); var formfields = $("#ajax-upload-files").serializeArray();
@ -210,7 +210,7 @@ function UploadFile(file, idx) {
$.each(formfields, function(i, field) { $.each(formfields, function(i, field) {
data.append(field.name, field.value); data.append(field.name, field.value);
}); });
data.append('file', file); data.append('userfile', file);
xhr.send(data); xhr.send(data);
} }

41
view/tpl/cloud_actionspanel.tpl
View File

@ -1,20 +1,31 @@
<div id="files-mkdir-tools" class="section-content-tools-wrapper"> <div id="files-mkdir-tools" class="section-content-tools-wrapper">
<label for="files-mkdir">{{$folder_header}}</label> <label for="files-mkdir">{{$folder_header}}</label>
<form method="post" action=""> <form method="post" action="">
<input type="hidden" name="sabreAction" value="mkcol"> <input type="hidden" name="sabreAction" value="mkcol">
<input id="files-mkdir" type="text" name="name" class="form-control form-group"> <input id="files-mkdir" type="text" name="name" class="form-control form-group">
<button class="btn btn-primary btn-sm pull-right" type="submit" value="{{$folder_submit}}">{{$folder_submit}}</button> <button class="btn btn-primary btn-sm pull-right" type="submit" value="{{$folder_submit}}">{{$folder_submit}}</button>
</form> </form>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<div id="files-upload-tools" class="section-content-tools-wrapper"> <div id="files-upload-tools" class="section-content-tools-wrapper">
{{if $quota.limit || $quota.used}}<div class="{{if $quota.warning}}section-content-danger-wrapper{{else}}section-content-info-wrapper{{/if}}">{{if $quota.warning}}<strong>{{$quota.warning}} </strong>{{/if}}{{$quota.desc}}</div>{{/if}} {{if $quota.limit || $quota.used}}<div class="{{if $quota.warning}}section-content-danger-wrapper{{else}}section-content-info-wrapper{{/if}}">{{if $quota.warning}}<strong>{{$quota.warning}} </strong>{{/if}}{{$quota.desc}}</div>{{/if}}
<form id="ajax-upload-files" method="post" action="" enctype="multipart/form-data" class="acl-form" data-form_id="ajax-upload-files" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'> <form id="ajax-upload-files" method="post" action="file_upload" enctype="multipart/form-data" class="acl-form" data-form_id="ajax-upload-files" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
<input type="hidden" name="sabreAction" value="put"> <input type="hidden" name="directory" value="{{$path}}" />
<label for="files-upload">{{$upload_header}}</label> <input type="hidden" name="channick" value="{{$channick}}" />
<input class="form-group pull-left" id="files-upload" type="file" name="file"> <input type="hidden" name="return_url" value="{{$return_url}}" />
<button id="upload-submit" class="btn btn-primary btn-sm pull-right" type="submit" value="{{$upload_submit}}">{{$upload_submit}}</button> <label for="files-upload">{{$upload_header}}</label>
</form> <input class="form-group pull-left" id="files-upload" type="file" name="userfile">
<div class="clear"></div> <div class="pull-right btn-group">
<div class="btn-group">
{{if $lockstate}}
<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="fa fa-{{$lockstate}}"></i>
</button>
{{/if}}
<button id="upload-submit" class="btn btn-primary btn-sm pull-right" type="submit" name="submit" value="{{$upload_submit}}">{{$upload_submit}}</button>
</div>
</div>
</form>
<div class="clear"></div>
</div> </div>
{{$aclselect}} {{$aclselect}}