upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

Merge branch 'master' into remove_unused_vars

Browse source 
Conflicts:
	apps/files_encryption/lib/util.php
This commit is contained in:
Florin Peter 2013-05-27 17:26:35 +02:00
commit 690bf9b8c4
3 changed files with 402 additions and 310 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

705
apps/files_encryption/lib/util.php
View file

File diff suppressed because it is too large Load diff

2
apps/files_trashbin/js/trash.js
View file

@ -93,6 +93,7 @@ $(document).ready(function() {
});
$('.undelete').click('click',function(event) {
event.preventDefault();
var spinner = '<img class="move2trash" title="'+t('files_trashbin', 'perform restore operation')+'" src="'+ OC.imagePath('core', 'loader.gif') +'"></a>';
var files=getSelectedFiles('file');
var fileslist = JSON.stringify(files);
@ -117,6 +118,7 @@ $(document).ready(function() {
});
$('.delete').click('click',function(event) {
event.preventDefault();
console.log("delete selected");
var spinner = '<img class="move2trash" title="'+t('files_trashbin', 'Delete permanently')+'" src="'+ OC.imagePath('core', 'loading.gif') +'"></a>';
var files=getSelectedFiles('file');

5
lib/files.php
View file

@ -123,8 +123,11 @@ class OC_Files {
header('Content-Length: ' . filesize($filename));
self::addSendfileHeader($filename);
}else{
$filesize = \OC\Files\Filesystem::filesize($filename);
header('Content-Type: '.\OC\Files\Filesystem::getMimeType($filename));
header("Content-Length: ".\OC\Files\Filesystem::filesize($filename));
if ($filesize > -1) {
header("Content-Length: ".$filesize);
}
list($storage) = \OC\Files\Filesystem::resolvePath($filename);
if ($storage instanceof \OC\Files\Storage\Local) {
self::addSendfileHeader(\OC\Files\Filesystem::getLocalFile($filename));