'+
@@ -194,11 +194,8 @@
success: function() {
if (self.mailView) {
// also send out email first
- self.mailView.sendEmails().then(done).fail(function() {
- done();
- // re-show the popup
- self.show();
- });
+ // do not resolve on errors
+ self.mailView.sendEmails().then(done);
} else {
done();
}
@@ -243,7 +240,7 @@
publicUploadPossible : this._isPublicUploadPossible(),
- publicUploadLabel : t('core', 'Upload only (File Drop)'),
+ publicUploadLabel : t('core', 'Upload only') + ' (File Drop)',
publicUploadDescription : t('core', 'Receive files from others without revealing the contents of the folder.'),
publicUploadValue : OC.PERMISSION_CREATE,
publicUploadSelected : this.model.get('permissions') === OC.PERMISSION_CREATE,
@@ -326,18 +323,27 @@
var self = this;
var title = t('files_sharing', 'Edit link share: {name}', {name: this.itemModel.getFileInfo().getFullPath()});
var buttons = [{
- text: t('core', 'Save'),
- click: _.bind(this._onClickSave, this),
- defaultButton: true
- }, {
text: t('core', 'Cancel'),
click: _.bind(this._onClickCancel, this)
}];
if (this.model.isNew()) {
title = t('files_sharing', 'Create link share: {name}', {name: this.itemModel.getFileInfo().getFullPath()});
+ buttons.unshift({
+ text: t('core', 'Share'),
+ click: _.bind(this._onClickSave, this),
+ defaultButton: true
+ })
}
- else if (this.model.get('encryptedPassword')) {
+ else {
+ buttons.unshift({
+ text: t('core', 'Save'),
+ click: _.bind(this._onClickSave, this),
+ defaultButton: true
+ })
+ }
+
+ if (this.model.get('encryptedPassword')) {
buttons.push({
classes: 'removePassword -float-left',
text: t('core', 'Remove password'),
diff --git a/core/js/sharedialogmailview.js b/core/js/sharedialogmailview.js
index 35635c60e748..042e75013743 100644
--- a/core/js/sharedialogmailview.js
+++ b/core/js/sharedialogmailview.js
@@ -12,14 +12,23 @@
if (!OC.Share) {
OC.Share = {};
}
-
- var TEMPLATE =
- '
'
- ;
-
+
+ var TEMPLATE =
+ '
';
+
/**
* @class OCA.Share.ShareDialogMailView
* @member {OC.Share.ShareItemModel} model
@@ -34,121 +43,131 @@
/** @type {string} **/
id: 'shareDialogMailView',
+ events: {
+ "keyup .emailPrivateLinkForm--emailField" : "toggleMailElements",
+ "keydown .emailPrivateLinkForm--emailBodyField" : "expandMailBody"
+ },
+
/** @type {Function} **/
_template: undefined,
initialize: function(options) {
- if(!_.isUndefined(options.itemModel)) {
+ if (!_.isUndefined(options.itemModel)) {
this.itemModel = options.itemModel;
} else {
throw 'missing OC.Share.ShareItemModel';
}
},
+ toggleMailElements: function() {
+ var $email = this.$el.find('.emailPrivateLinkForm--emailField');
+ var $emailElements = this.$el.find('.emailPrivateLinkForm--elements');
+
+ if ($email.val().length > 0 && $emailElements.is(":hidden")) {
+ $emailElements.slideDown();
+ } else if ($email.val().length === 0 && $emailElements.is(":visible")) {
+ $emailElements.slideUp();
+ }
+ },
+
+ expandMailBody: function(event) {
+ var $emailBody = this.$el.find('.emailPrivateLinkForm--emailBodyField');
+ $emailBody.css('minHeight', $emailBody[0].scrollHeight - 12);
+
+ if (event.keyCode == 13) {
+ event.stopPropagation();
+ }
+ },
+
/**
* Send the link share information by email
*
* @param {string} recipientEmail recipient email address
*/
- _sendEmailPrivateLink: function(recipientEmail) {
- var deferred = $.Deferred();
- var itemType = this.itemModel.get('itemType');
+ _sendEmailPrivateLink: function(mail) {
+ var deferred = $.Deferred();
+ var itemType = this.itemModel.get('itemType');
var itemSource = this.itemModel.get('itemSource');
- if (!this.validateEmail(recipientEmail)) {
- deferred.reject();
+ if (!this.validateEmail(mail.to)) {
+ return deferred.reject({
+ message: t('core', '{email} is not a valid address!', {email: mail.to})
+ });
}
+ var params = {
+ action : 'email',
+ toAddress : mail.to,
+ emailBody : mail.body,
+ bccSelf : mail.bccSelf,
+ link : this.model.getLink(),
+ itemType : itemType,
+ itemSource : itemSource,
+ file : this.itemModel.getFileInfo().get('name'),
+ expiration : this.model.get('expireDate') || ''
+ };
+
$.post(
- OC.generateUrl('core/ajax/share.php'), {
- action: 'email',
- toaddress: recipientEmail,
- link: this.model.getLink(),
- itemType: itemType,
- itemSource: itemSource,
- file: this.itemModel.getFileInfo().get('name'),
- expiration: this.model.get('expireDate') || ''
- },
+ OC.generateUrl('core/ajax/share.php'), params,
function(result) {
if (!result || result.status !== 'success') {
- OC.dialogs.alert(result.data.message, t('core', 'Error while sending notification'));
- deferred.reject();
+ deferred.reject({
+ message: result.data.message
+ });
} else {
deferred.resolve();
}
- }).fail(function() {
- deferred.reject();
+ }).fail(function(error) {
+ return deferred.reject();
});
return deferred.promise();
},
- validateEmail: function (email) {
+ validateEmail: function(email) {
+ if (email.length === 0)
+ return true
+
return email.match(/([\w\.\-_]+)?\w+@[\w-_]+(\.\w+){1,}$/);
},
sendEmails: function() {
- var $emailField = this.$el.find('.emailField');
- var $emailButton = this.$el.find('.emailButton');
- var email = $emailField.val();
- if (email !== '') {
- $emailField.prop('disabled', true);
- $emailButton.prop('disabled', true);
- $emailField.val(t('core', 'Sending ...'));
- return this._sendEmailPrivateLink(email).done(function() {
- $emailField.css('font-weight', 'bold').val(t('core','Email sent'));
+ var $formItems = this.$el.find('.emailPrivateLinkForm input, .emailPrivateLinkForm textarea');
+ var $formSendIndicator = this.$el.find('.emailPrivateLinkForm--send-indicator');
+ var mail = {
+ to : this.$el.find('.emailPrivateLinkForm--emailField').val().toLowerCase(),
+ bccSelf : this.$el.find('.emailPrivateLinkForm--emailBccSelf').is(':checked'),
+ body : this.$el.find('.emailPrivateLinkForm--emailBodyField').val()
+ };
+
+ if (mail.to !== '') {
+ $formItems.prop('disabled', true);
+ $formSendIndicator.removeClass('hidden');
+ return this._sendEmailPrivateLink(mail).done(function() {
setTimeout(function() {
- $emailField.val('');
- $emailField.css('font-weight', 'normal');
- $emailField.prop('disabled', false);
- $emailButton.prop('disabled', false);
+ $formItems.prop('disabled', false);
+ $formSendIndicator.addClass('hidden');
}, 2000);
- }).fail(function() {
- $emailField.val(email);
- $emailField.css('font-weight', 'normal');
- $emailField.prop('disabled', false);
- $emailButton.prop('disabled', false);
+ }).fail(function(error) {
+ OC.dialogs.info(error.message, t('core', 'An error occured'));
+ $formSendIndicator.addClass('hidden');
+ $formItems.prop('disabled', false);
});
}
return $.Deferred().resolve();
},
render: function() {
- var email = this.$el.find('.emailField').val();
-
this.$el.html(this.template({
- cid: this.cid,
- mailPrivatePlaceholder: t('core', 'Email link to person'),
- mailLabel: t('core', 'Send link via email'),
- email: email
+ cid : this.cid,
+ userHasEmail : !!OC.getCurrentUser().email,
+ mailPlaceholder : t('core', 'Email link to person'),
+ bccSelf : t('core', 'Send copy to self'),
+ mailLabel : t('core', 'Send link via email'),
+ mailBodyPlaceholder : t('core', 'Add personal message'),
+ sending : t('core', 'Sending') + ' ...'
}));
- var $emailField = this.$el.find('.emailField');
- if ($emailField.length !== 0) {
- $emailField.autocomplete({
- minLength: 1,
- source: function (search, response) {
- $.get(
- OC.generateUrl('core/ajax/share.php'), {
- fetch: 'getShareWithEmail',
- search: search.term
- }, function(result) {
- if (result.status == 'success' && result.data.length > 0) {
- response(result.data);
- }
- });
- },
- select: function( event, item ) {
- $emailField.val(item.item.email);
- return false;
- }
- })
- .data("ui-autocomplete")._renderItem = function( ul, item ) {
- return $('
')
- .append('' + escapeHTML(item.displayname) + "
" + escapeHTML(item.email) + '' )
- .appendTo( ul );
- };
- }
this.delegateEvents();
return this;
diff --git a/core/js/tests/specs/sharedialoglinkshareviewSpec.js b/core/js/tests/specs/sharedialoglinkshareviewSpec.js
index 7c44a3525672..2ecdbca648ff 100644
--- a/core/js/tests/specs/sharedialoglinkshareviewSpec.js
+++ b/core/js/tests/specs/sharedialoglinkshareviewSpec.js
@@ -28,7 +28,7 @@ describe('OC.Share.ShareDialogLinkShareView', function() {
var view;
var PASSWORD_PLACEHOLDER_STARS = '**********';
- var PASSWORD_PLACEHOLDER_MESSAGE = 'Choose a password for the public link';
+ var PASSWORD_PLACEHOLDER_MESSAGE = 'Choose a password';
beforeEach(function() {
configModel = new OC.Share.ShareConfigModel();
diff --git a/core/js/tests/specs/sharedialogmailviewSpec.js b/core/js/tests/specs/sharedialogmailviewSpec.js
index 599780d2ff81..355a54cd20b5 100644
--- a/core/js/tests/specs/sharedialogmailviewSpec.js
+++ b/core/js/tests/specs/sharedialogmailviewSpec.js
@@ -1,23 +1,23 @@
/**
-* ownCloud
-*
-* @author Vincent Petry
-* @copyright Copyright (c) 2017 Vincent Petry
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either
-* version 3 of the License, or any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*
-* You should have received a copy of the GNU Affero General Public
-* License along with this library. If not, see .
-*
-*/
+ * ownCloud
+ *
+ * @author Vincent Petry
+ * @copyright Copyright (c) 2017 Vincent Petry
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see .
+ *
+ */
/* global oc_appconfig */
describe('OC.Share.ShareDialogMailView', function() {
@@ -25,7 +25,7 @@ describe('OC.Share.ShareDialogMailView', function() {
var view;
var model;
var itemModel;
- var autocompleteStub;
+ var currentUserStub;
beforeEach(function() {
var configModel = new OC.Share.ShareConfigModel();
@@ -47,9 +47,10 @@ describe('OC.Share.ShareDialogMailView', function() {
fileInfoModel: fileInfoModel
});
- autocompleteStub = sinon.stub($.fn, 'autocomplete').callsFake(function() {
- $(this).data('ui-autocomplete', {});
- return $(this);
+ currentUserStub = sinon.stub(OC, 'getCurrentUser').returns({
+ uid: 'someuser',
+ displayName: 'Some User',
+ email: 'someuser@example.org'
});
model = new OC.Share.ShareModel({
@@ -70,34 +71,45 @@ describe('OC.Share.ShareDialogMailView', function() {
});
view.render();
});
-
- afterEach(function() {
- view.remove();
- autocompleteStub.restore();
- });
- it('rendering', function() {
- expect(view.$('.emailField').length).toEqual(1);
+ afterEach(function() {
+ view.remove();
+ currentUserStub.restore();
});
- describe('autocomplete', function() {
-
- it('asks the server for matching email addresses', function() {
- expect(autocompleteStub.calledOnce).toEqual(true);
+ describe('renders', function() {
+ it('bcc checkbox field if usermail is present', function() {
+ // mail set in initial currentUserStub
+ expect(view.$('.emailPrivateLinkForm--emailBccSelf').length).toEqual(1);
+ });
+ });
+ describe('sending emails', function() {
+ it('sends entered emails when calling sendEmails()', function() {
var callback = sinon.stub();
- autocompleteStub.getCall(0).args[0].source({
- term: 'search@example.com'
- }, callback);
+ view.$('.emailPrivateLinkForm--emailField').val('email@example.com');
+ view.sendEmails().then(callback);
+ expect(callback.notCalled).toEqual(true);
expect(fakeServer.requests.length).toEqual(1);
-
- expect(fakeServer.requests[0].method).toEqual('GET');
- expect(fakeServer.requests[0].url).toEqual(OC.generateUrl('core/ajax/share.php') + '?fetch=getShareWithEmail&search=search%40example.com');
+ expect(fakeServer.requests[0].method).toEqual('POST');
+ expect(fakeServer.requests[0].url).toEqual(OC.generateUrl('core/ajax/share.php'));
+ expect(OC.parseQueryString(fakeServer.requests[0].requestBody)).toEqual({
+ action: 'email',
+ toAddress: 'email@example.com',
+ link: model.getLink(),
+ itemType: 'folder',
+ itemSource: '123',
+ file: 'shared_folder',
+ expiration: '2017-10-12',
+ emailBody: '',
+ bccSelf: 'false'
+ });
fakeServer.requests[0].respond(
- 200,
- { 'Content-Type': 'application/json' },
+ 200, {
+ 'Content-Type': 'application/json'
+ },
JSON.stringify({
status: 'success',
data: [
@@ -108,40 +120,34 @@ describe('OC.Share.ShareDialogMailView', function() {
);
expect(callback.calledOnce).toEqual(true);
- expect(callback.getCall(0).args[0]).toEqual([
- 'someresult1',
- 'someresult2'
- ]);
-
});
- });
-
- describe('sending emails', function() {
- it('sends entered emails when calling sendEmails()', function() {
+ it('sends mail to self if BCC is checked', function() {
var callback = sinon.stub();
- view.$('.emailField').val('email@example.com');
+ view.$('.emailPrivateLinkForm--emailField').val('GlaDOS@aperture.com');
+ view.$('.emailPrivateLinkForm--emailBccSelf').prop('checked', 'checked');
+ view.$('.emailPrivateLinkForm--emailBodyField').val('The Cake Is A Lie!');
view.sendEmails().then(callback);
expect(callback.notCalled).toEqual(true);
-
expect(fakeServer.requests.length).toEqual(1);
-
expect(fakeServer.requests[0].method).toEqual('POST');
- expect(fakeServer.requests[0].url)
- .toEqual(OC.generateUrl('core/ajax/share.php'));
+ expect(fakeServer.requests[0].url).toEqual(OC.generateUrl('core/ajax/share.php'));
expect(OC.parseQueryString(fakeServer.requests[0].requestBody)).toEqual({
action: 'email',
- toaddress: 'email@example.com',
+ toAddress: 'glados@aperture.com',
link: model.getLink(),
itemType: 'folder',
itemSource: '123',
file: 'shared_folder',
- expiration: '2017-10-12'
+ expiration: '2017-10-12',
+ emailBody: 'The Cake Is A Lie!',
+ bccSelf: 'true'
});
fakeServer.requests[0].respond(
- 200,
- { 'Content-Type': 'application/json' },
+ 200, {
+ 'Content-Type': 'application/json'
+ },
JSON.stringify({
status: 'success',
data: [
@@ -161,15 +167,16 @@ describe('OC.Share.ShareDialogMailView', function() {
it('rejects promise in case of failure', function() {
var callback = sinon.stub();
var rejectCallback = sinon.stub();
- view.$('.emailField').val('email@example.com');
+ view.$('.emailPrivateLinkForm--emailField').val('email@example.com');
view.sendEmails().then(callback).fail(rejectCallback);
expect(callback.notCalled).toEqual(true);
expect(fakeServer.requests.length).toEqual(1);
fakeServer.requests[0].respond(
- 200,
- { 'Content-Type': 'application/json' },
+ 200, {
+ 'Content-Type': 'application/json'
+ },
JSON.stringify({
status: 'error',
data: {
diff --git a/lib/private/Share/MailNotifications.php b/lib/private/Share/MailNotifications.php
index 033d3ffa0f56..b605c25b1fdc 100644
--- a/lib/private/Share/MailNotifications.php
+++ b/lib/private/Share/MailNotifications.php
@@ -87,6 +87,19 @@ public function __construct(IUser $user,
$this->senderDisplayName = $this->user->getDisplayName();
}
+ /**
+ * split a list of comma or semicolon separated email addresses
+ *
+ * @param string $mailsstring email addresses
+ * @return array list of individual addresses
+ */
+ private function _mailStringToArray($mailsstring) {
+ $sanatised = str_replace([', ', '; ', ',', ';', ' '], ',', $mailsstring);
+ $mail_array = explode(',', $sanatised);
+
+ return $mail_array;
+ }
+
/**
* inform users if a file was shared with them
*
@@ -156,26 +169,42 @@ public function sendInternalShareMail($recipientList, $itemSource, $itemType) {
}
+ public function sendLinkShareMail($recipient, $filename, $link, $expiration) {
+ $subject = (string)$this->l->t('%s shared »%s« with you', [$this->senderDisplayName, $filename]);
+ list($htmlBody, $textBody) = $this->createMailBody($filename, $link, $expiration);
+
+ return $this->sendLinkShareMailFromBody($recipient, $subject, $htmlBody, $textBody);
+ }
+
/**
* inform recipient about public link share
*
* @param string $recipient recipient email address
* @param string $filename the shared file
* @param string $link the public link
+ * @param array $options allows ['cc'] and ['bcc'] recipients
* @param int $expiration expiration date (timestamp)
* @return string[] $result of failed recipients
*/
- public function sendLinkShareMail($recipient, $filename, $link, $expiration) {
- $subject = (string)$this->l->t('%s shared »%s« with you', [$this->senderDisplayName, $filename]);
- list($htmlBody, $textBody) = $this->createMailBody($filename, $link, $expiration);
+ public function sendLinkShareMailFromBody($recipient, $subject, $htmlBody, $textBody, $options = array()) {
+
+ $recipients = $this->_mailStringToArray($recipient);
+ $ccRecipients = (isset($options['cc']) && $options['cc'] !== '') ? $this->_mailStringToArray($options['cc']) : null;
+ $bccRecipients = (isset($options['bcc']) && $options['bcc'] !== '') ? $this->_mailStringToArray($options['bcc']) : null;
- $recipient = str_replace([', ', '; ', ',', ';', ' '], ',', $recipient);
- $recipients = explode(',', $recipient);
try {
$message = $this->mailer->createMessage();
$message->setSubject($subject);
$message->setTo($recipients);
- $message->setHtmlBody($htmlBody);
+ if ($htmlBody !== null) {
+ $message->setHtmlBody($htmlBody);
+ }
+ if ($bccRecipients !== null) {
+ $message->setBcc($bccRecipients);
+ }
+ if ($ccRecipients !== null) {
+ $message->setCc($ccRecipients);
+ }
$message->setPlainBody($textBody);
$message->setFrom([
Util::getDefaultEmailAddress('sharing-noreply') =>
@@ -204,7 +233,7 @@ public function sendLinkShareMail($recipient, $filename, $link, $expiration) {
* @param string $prefix prefix of mail template files
* @return array an array of the html mail body and the plain text mail body
*/
- private function createMailBody($filename, $link, $expiration, $prefix = '') {
+ public function createMailBody($filename, $link, $expiration, $prefix = '') {
$formattedDate = $expiration ? $this->l->l('date', $expiration) : null;
$html = new \OC_Template('core', $prefix . 'mail', '');
diff --git a/tests/ui/features/lib/FilesPageElement/SharingDialogElement/EditPublicLinkPopup.php b/tests/ui/features/lib/FilesPageElement/SharingDialogElement/EditPublicLinkPopup.php
index 4f9f7afed3d6..982c0a7f2292 100644
--- a/tests/ui/features/lib/FilesPageElement/SharingDialogElement/EditPublicLinkPopup.php
+++ b/tests/ui/features/lib/FilesPageElement/SharingDialogElement/EditPublicLinkPopup.php
@@ -41,7 +41,7 @@ class EditPublicLinkPopup extends OwncloudPage {
private $expirationDateLabelXpath = ".//label[contains(text(), 'Expiration')]";
private $expirationDateInputXpath = ".//input[contains(@class,'expirationDate')]";
private $emailInputXpath = ".//input[@type='email']";
- private $saveButtonXpath = ".//button[contains(text(), 'Save')]";
+ private $shareButtonXpath = ".//button[contains(text(), 'Share')]";
/**
@@ -184,11 +184,11 @@ public function setLinkEmail($email) {
* @return void
*/
public function save() {
- $saveButton = $this->popupElement->find("xpath", $this->saveButtonXpath);
+ $saveButton = $this->popupElement->find("xpath", $this->shareButtonXpath);
if (is_null($saveButton)) {
throw new ElementNotFoundException(
__METHOD__ .
- " xpath $this->saveButtonXpath" .
+ " xpath $this->shareButtonXpath" .
" could not find save button of the public link popup"
);
}