diff options
| author | Michael Gapczynski <GapczynskiM@gmail.com> | 2012-05-14 20:09:10 -0400 |
|---|---|---|
| committer | Michael Gapczynski <GapczynskiM@gmail.com> | 2012-05-14 20:21:31 -0400 |
| commit | cda9dcc7aaa701cec214122ae7127767d23af2f4 (patch) | |
| tree | fa2e976b19de3b20ce76d378e9d5e25ca0e97d65 /apps | |
| parent | 5cf42b88aff43022324857c11b146c82b21cd597 (diff) | |
| download | nextcloud-server-cda9dcc7aaa701cec214122ae7127767d23af2f4.tar.gz nextcloud-server-cda9dcc7aaa701cec214122ae7127767d23af2f4.zip | |
Fix private link emailing and clean up file name displayed in email
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files_sharing/ajax/email.php | 6 | ||||
| -rw-r--r-- | apps/files_sharing/js/share.js | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/apps/files_sharing/ajax/email.php b/apps/files_sharing/ajax/email.php index 9eba203465e..823462b9921 100644 --- a/apps/files_sharing/ajax/email.php +++ b/apps/files_sharing/ajax/email.php @@ -3,9 +3,9 @@ OCP\JSON::checkLoggedIn(); OCP\JSON::checkAppEnabled('files_sharing'); $user = OCP\USER::getUser(); // TODO translations -$subject = $user + ' ' + 'shared a file with you'; -$link = $_POST['link'] + '&f=' + $_POST['f']; -$text = $user + ' ' + 'shared the file' + ' ' + $_POST['f'] + ' ' + 'with you.' + ' ' + 'It is available for download here:' + ' ' + $link; +$subject = $user.' shared a file with you'; +$link = $_POST['link']; +$text = $user.' shared the file '.$_POST['file'].' with you. It is available for download here: '.$link; $fromaddress = OCP\Config::getUserValue($user, 'settings', 'email', 'sharing-noreply@'.$_SERVER['HTTP_HOST']); OC_Mail::send($_POST['toaddress'], $_POST['toaddress'], $subject, $text, $fromaddress, $user); diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js index dbf5588c4e3..ac1209956d6 100644 --- a/apps/files_sharing/js/share.js +++ b/apps/files_sharing/js/share.js @@ -204,7 +204,9 @@ OC.Share={ $('#email').animate({ fontWeight: 'normal' }, 2000, function() { $(this).val(''); }).val('Email sent'); - $.post(OC.filePath('files_sharing', 'ajax', 'email.php'), 'toaddress='+$('#email').val()+'&link='+$('#link').val()); + var link = $('#privateLinkText').val(); + var file = link.substr(link.lastIndexOf('/') + 1).replace(/%20/g, ' '); + $.post(OC.filePath('files_sharing', 'ajax', 'email.php'), { toaddress: $('#email').val(), link: link, file: file } ); }, dirname:function(path) { return path.replace(/\\/g,'/').replace(/\/[^\/]*$/, ''); |