diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2014-01-24 07:44:33 -0800 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2014-01-24 07:44:33 -0800 |
| commit | 3bea9b8ddde4a013200345f16dfcd4391f0eb151 (patch) | |
| tree | e9393fa27ae4189fa7c7197cb0fd63e42c8fb648 /core | |
| parent | dff2675efa3e83c229e7b88b729bb5534417f63d (diff) | |
| parent | 77de47858b6f53bfa36b84de5e316e6e804ad7ca (diff) | |
| download | nextcloud-server-3bea9b8ddde4a013200345f16dfcd4391f0eb151.tar.gz nextcloud-server-3bea9b8ddde4a013200345f16dfcd4391f0eb151.zip | |
Merge pull request #6905 from owncloud/add_expiredate_to_linkshare
add expire date to link share if possible
Diffstat (limited to 'core')
| -rw-r--r-- | core/ajax/share.php | 21 | ||||
| -rw-r--r-- | core/js/share.js | 6 |
2 files changed, 24 insertions, 3 deletions
diff --git a/core/ajax/share.php b/core/ajax/share.php index be02c056357..268cd4f53a7 100644 --- a/core/ajax/share.php +++ b/core/ajax/share.php @@ -119,8 +119,12 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo $subject = (string)$l->t('%s shared »%s« with you', array($ownerDisplayName, $filename)); $expiration = null; if (isset($items[0]['expiration'])) { - $date = new DateTime($items[0]['expiration']); - $expiration = $date->format('Y-m-d'); + try { + $date = new DateTime($items[0]['expiration']); + $expiration = $date->format('Y-m-d'); + } catch (Exception $e) { + \OCP\Util::writeLog('sharing', "Couldn't read date: " . $e->getMessage(), \OCP\Util::ERROR); + } } if ($itemType === 'folder') { @@ -191,6 +195,17 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo $file = $_POST['file']; $to_address = $_POST['toaddress']; + $expiration = null; + if (isset($_POST['expiration']) && $_POST['expiration'] !== '') { + try { + $date = new DateTime($_POST['expiration']); + $expiration = $date->format('Y-m-d'); + } catch (Exception $e) { + \OCP\Util::writeLog('sharing', "Couldn't read date: " . $e->getMessage(), \OCP\Util::ERROR); + } + + } + // enable l10n support $l = OC_L10N::get('core'); @@ -202,6 +217,7 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo $content->assign ('type', $type); $content->assign ('user_displayname', $displayName); $content->assign ('filename', $file); + $content->assign('expiration', $expiration); $text = $content->fetchPage(); $content = new OC_Template("core", "altmail", ""); @@ -209,6 +225,7 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo $content->assign ('type', $type); $content->assign ('user_displayname', $displayName); $content->assign ('filename', $file); + $content->assign('expiration', $expiration); $alttext = $content->fetchPage(); $default_from = OCP\Util::getDefaultEmailAddress('sharing-noreply'); diff --git a/core/js/share.js b/core/js/share.js index 3637d2e7e72..0939259b7da 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -733,12 +733,16 @@ $(document).ready(function() { var itemSource = $('#dropdown').data('item-source'); var file = $('tr').filterAttr('data-id', String(itemSource)).data('file'); var email = $('#email').val(); + var expirationDate = ''; + if ( $('#expirationCheckbox').is(':checked') === true ) { + expirationDate = $( "#expirationDate" ).val(); + } if (email != '') { $('#email').prop('disabled', true); $('#email').val(t('core', 'Sending ...')); $('#emailButton').prop('disabled', true); - $.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'email', toaddress: email, link: link, itemType: itemType, itemSource: itemSource, file: file}, + $.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'email', toaddress: email, link: link, itemType: itemType, itemSource: itemSource, file: file, expiration: expirationDate}, function(result) { $('#email').prop('disabled', false); $('#emailButton').prop('disabled', false); |