mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #7557 from owncloud/issue/7297 

Do not allow setting an expiration date in the past
This commit is contained in:
Vincent Petry 2014-03-19 15:53:08 +01:00
parent 4f95adfb76 7ab2632085
commit 6252c248c2
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/ajax/share.php
View File

@ -80,6 +80,14 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
break; break;
case 'setExpirationDate': case 'setExpirationDate':
if (isset($_POST['date'])) { if (isset($_POST['date'])) {
$l = OC_L10N::get('core');
$date = new \DateTime($_POST['date']);
$today = new \DateTime('now');
if ($date < $today) {
OC_JSON::error(array('data' => array('message' => $l->t('Expiration date is in the past.'))));
return;
}
$return = OCP\Share::setExpirationDate($_POST['itemType'], $_POST['itemSource'], $_POST['date']); $return = OCP\Share::setExpirationDate($_POST['itemType'], $_POST['itemSource'], $_POST['date']);
($return) ? OC_JSON::success() : OC_JSON::error(); ($return) ? OC_JSON::success() : OC_JSON::error();
} }

14
core/js/share.js
View File

@ -718,9 +718,21 @@ $(document).ready(function() {
$(document).on('change', '#dropdown #expirationDate', function() { $(document).on('change', '#dropdown #expirationDate', function() {
var itemType = $('#dropdown').data('item-type'); var itemType = $('#dropdown').data('item-type');
var itemSource = $('#dropdown').data('item-source'); var itemSource = $('#dropdown').data('item-source');
$(this).tipsy('hide');
$(this).removeClass('error');
$.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'setExpirationDate', itemType: itemType, itemSource: itemSource, date: $(this).val() }, function(result) { $.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'setExpirationDate', itemType: itemType, itemSource: itemSource, date: $(this).val() }, function(result) {
if (!result || result.status !== 'success') { if (!result || result.status !== 'success') {
OC.dialogs.alert(t('core', 'Error setting expiration date'), t('core', 'Error')); var expirationDateField = $('#dropdown #expirationDate');
if (!result.data.message) {
expirationDateField.attr('original-title', t('core', 'Error setting expiration date'));
} else {
expirationDateField.attr('original-title', result.data.message);
}
expirationDateField.tipsy({gravity: 'n', fade: true});
expirationDateField.tipsy('show');
expirationDateField.addClass('error');
} }
}); });
}); });