Skip to content

add "hide file list" option #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LukasReschke merged 11 commits into from
Jun 10, 2016
Merged

add "hide file list" option #19

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
bb54ab0
add hide file list option
schiessle Jun 7, 2016
66d8536
block webdav access if share is not readable
schiessle Jun 8, 2016
075bf73
Prevent access to shareinfo if share if read-only
LukasReschke Jun 8, 2016
53ba111
Fix XSS
LukasReschke Jun 9, 2016
5fdde42
Add fancy layout
LukasReschke Jun 9, 2016
6e99b0f
Make uploading possible via select and cleanup CSS
LukasReschke Jun 9, 2016
e878e78
Fix public upload for normal shares
LukasReschke Jun 9, 2016
0b00a06
Fix indentation
LukasReschke Jun 9, 2016
c268ad1
Add PHP unit test
LukasReschke Jun 9, 2016
c49402d
Add some error handling
LukasReschke Jun 9, 2016
54e2ac5
Add text about uploaded files
LukasReschke Jun 10, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Make uploading possible via select and cleanup CSS
  • Loading branch information
@LukasReschke
LukasReschke committed Jun 9, 2016
commit 6e99b0f59d3b0278c45d42dcec01ff554a89d979
23 changes: 23 additions & 0 deletions apps/files/ajax/upload.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,15 @@
$resolution = null;
}

if(isset($_POST['dirToken'])) {
// If it is a read only share the resolution will always be autorename
$shareManager = \OC::$server->getShareManager();
$share = $shareManager->getShareByToken((string)$_POST['dirToken']);
if (!($share->getPermissions() & \OCP\Constants::PERMISSION_READ)) {
$resolution = 'autorename';
}
}

// target directory for when uploading folders
$relativePath = '';
if(!empty($_POST['file_directory'])) {
Expand Down Expand Up @@ -247,6 +256,20 @@
}

if ($error === false) {
// Do not leak file information if it is a read-only share
if(isset($_POST['dirToken'])) {
$shareManager = \OC::$server->getShareManager();
$share = $shareManager->getShareByToken((string)$_POST['dirToken']);
if (!($share->getPermissions() & \OCP\Constants::PERMISSION_READ)) {
$newResults = [];
foreach($result as $singleResult) {
$fileName = $singleResult['originalname'];
$newResults['filename'] = $fileName;
$newResults['mimetype'] = \OC::$server->getMimeTypeDetector()->detectPath($fileName);
}
$result = $newResults;
}
}
OCP\JSON::encodedPrint($result);
} else {
OCP\JSON::error(array(array('data' => array_merge(array('message' => $error, 'code' => $errorCode), $storageStats))));
Expand Down
51 changes: 39 additions & 12 deletions apps/files_sharing/css/public.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,36 +159,63 @@ thead {
cursor: pointer;
}

#body-public #emptycontent h2 {


#public-upload .avatardiv {
margin: 0 auto;
}

#public-upload #emptycontent h2 {
margin: 10px 0 5px 0;
}

#body-public #emptycontent h2+p {
#public-upload #emptycontent h2+p {
margin-bottom: 30px;
}

#body-public #emptycontent .icon-folder {
#public-upload #emptycontent .icon-folder {
height: 16px;
width: 16px;
background-size: 16px;
display: inline-block;
vertical-align: text-top;
margin-bottom: 0;
margin-right: 5px;
opacity: 1;
}

#body-public #emptycontent .button {
background-size: 32px;
height: 32px;
width: 32px;
background-position: 16px;
#public-upload #emptycontent .button {
background-size: 16px;
height: 16px;
width: 16px;
background-position: 16px;
opacity: .7;
font-size: 20px;
margin: 20px;
padding: 10px 20px;
padding-left: 64px;
padding-left: 42px;
font-weight: normal;
}

#body-public .avatardiv {
margin: 0 auto;
}
#public-upload #emptycontent ul {
width: 160px;
margin: 25px auto;
text-align: left;
}

#public-upload #emptycontent li {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
padding: 7px 0;
}

#public-upload #emptycontent li img {
vertical-align: text-bottom;
margin-right: 5px;
}

#public-upload li span.icon-loading-small {
padding-left: 18px;
margin-right: 7px;
}
25 changes: 17 additions & 8 deletions apps/files_sharing/js/files_drop.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,24 +15,33 @@
// Prevent the default browser drop action:
e.preventDefault();
});
$('#publicUploadDiv').fileupload({
$('#public-upload').fileupload({
url: OC.linkTo('files', 'ajax/upload.php'),
dataType: 'json',
//maxFileSize: fileUploadContainer.data('maxupload'),
messages: {
maxFileSize: t('files_sharing', 'File is bigger than allowed.')
},
dropZone: $('#publicUploadDiv'),
dropZone: $('#public-upload'),
formData: {
dirToken: $('#sharingToken').val()
},
add: function(e, data) {
_.each(data['files'], function(file) {
$('#public-upload ul').append('<li data-name="'+escapeHTML(file.name)+'"><span class="icon-loading-small"></span> '+escapeHTML(file.name)+'</li>');
Copy link
Member

@blizzz blizzz Jun 9, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

template?

});
data.submit();
},
success: function (response) {
var mimeTypeUrl = OC.MimeType.getIconUrl(response['mimetype']);
$('#public-upload ul li[data-name="'+escapeHTML(response['filename'])+'"]').html('<img src="'+escapeHTML(mimeTypeUrl)+'"/> '+escapeHTML(response['filename']));
}
Copy link
Member

@blizzz blizzz Jun 9, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

error handling?

});

$('#public-upload .button.icon-upload').click(function(e) {
e.preventDefault();
$('#public-upload #emptycontent input').focus().trigger('click');
});
}
};

$(document).ready(function() {
if($('#uploadOnlyInterface').val() === "1") {
if($('#upload-only-interface').val() === "1") {
$('.avatardiv').avatar($('#sharingUserId').val(), 128, true);
}

Expand Down
10 changes: 1 addition & 9 deletions apps/files_sharing/js/public.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,11 +238,6 @@ OCA.Sharing.PublicApp = {
$(this).select();
});

$(document).on('click', '.content-wrapper-upload', function (e) {
//e.preventDefault();
$('#file_upload_start').focus().trigger('click');
});

$('.save-form').submit(function (event) {
event.preventDefault();

Expand Down Expand Up @@ -307,9 +302,7 @@ OCA.Sharing.PublicApp = {
$('#save-button-confirm')
.removeClass("icon-loading-small")
.addClass("icon-confirm");

}
else {
} else {
$('#save-button-confirm')
.removeClass("icon-confirm")
.addClass("icon-loading-small");
Expand All @@ -319,7 +312,6 @@ OCA.Sharing.PublicApp = {

toggleLoading();
var location = window.location.protocol + '//' + window.location.host + OC.webroot;

if(remote.substr(-1) !== '/') {
remote += '/'
};
Expand Down
14 changes: 10 additions & 4 deletions apps/files_sharing/templates/public.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,9 @@
<input type="hidden" name="mimetype" value="<?php p($_['mimetype']) ?>" id="mimetype">
<input type="hidden" name="previewSupported" value="<?php p($_['previewSupported'] ? 'true' : 'false'); ?>" id="previewSupported">
<input type="hidden" name="mimetypeIcon" value="<?php p(\OC::$server->getMimeTypeDetector()->mimeTypeIcon($_['mimetype'])); ?>" id="mimetypeIcon">
<input type="hidden" name="filesize" value="<?php p($_['nonHumanFileSize']); ?>" id="filesize">
<?php if (!isset($_['hideFileList']) || (isset($_['hideFileList']) && $_['hideFileList'] === false)): ?>
<input type="hidden" name="filesize" value="<?php p($_['nonHumanFileSize']); ?>" id="filesize">
<?php endif; ?>
<input type="hidden" name="maxSizeAnimateGif" value="<?php p($_['maxSizeAnimateGif']); ?>" id="maxSizeAnimateGif">


Expand Down Expand Up @@ -89,7 +91,7 @@
</div>
</div></header>
<div id="content-wrapper" <?php if(isset($_['hideFileList']) && $_['hideFileList'] === true){ print_unescaped(" class=\"content-wrapper-upload\"");} ?>>
<?php if (!isset($_['hideFileList']) || (isset($_['hideFileList']) && $_['hideFileList'] === false)) { ?>
<?php if (!isset($_['hideFileList']) || (isset($_['hideFileList']) && $_['hideFileList'] === false)) { ?>
<div id="preview">
<?php if (isset($_['folder'])): ?>
<?php print_unescaped($_['folder']); ?>
Expand Down Expand Up @@ -117,13 +119,17 @@
<?php endif; ?>
</div>
<?php } else { ?>
<input type="hidden" id="uploadOnlyInterface" value="1"/>
<div id="publicUploadDiv">
<input type="hidden" id="upload-only-interface" value="1"/>
<div id="public-upload">
<div id="emptycontent" class="">
<div id="displayavatar"><div class="avatardiv"></div></div>
<h2><?php p($l->t('Upload files to %s', [$_['shareOwner']])) ?></h2>
<p><span class="icon-folder"></span> <?php p($_['filename']) ?></p>
<input type="file" name="files[]" class="hidden" multiple>

<a href="#" class="button icon-upload"><?php p($l->t('Select')) ?></a>
<ul>
</ul>
</div>
</div>
<?php } ?>
Expand Down