зеркало из https://github.com/nextcloud/server.git
restoring feature to send sharing link via email
This commit is contained in:
Родитель
9a3a83e16a
Коммит
45074d5023
|
@ -0,0 +1,39 @@
|
||||||
|
<?php
|
||||||
|
OCP\JSON::checkLoggedIn();
|
||||||
|
OCP\JSON::callCheck();
|
||||||
|
OCP\JSON::checkAppEnabled('files_sharing');
|
||||||
|
|
||||||
|
// read post variables
|
||||||
|
$user = OCP\USER::getUser();
|
||||||
|
$type = $_POST['type'];
|
||||||
|
$link = $_POST['link'];
|
||||||
|
$file = $_POST['file'];
|
||||||
|
$to_address = $_POST['toaddress'];
|
||||||
|
|
||||||
|
// enable l10n support
|
||||||
|
$l = OC_L10N::get('files_sharing');
|
||||||
|
|
||||||
|
// setup the email
|
||||||
|
$subject = (string)$l->t('User %s shared a file with you', $user);
|
||||||
|
if ($type === 'dir')
|
||||||
|
$subject = (string)$l->t('User %s shared a folder with you', $user);
|
||||||
|
|
||||||
|
$text = (string)$l->t('User %s shared the file "%s" with you. It is available for download here: %s', array($user, $file, $link));
|
||||||
|
if ($type === 'dir')
|
||||||
|
$text = (string)$l->t('User %s shared the folder "%s" with you. It is available for download here: %s', array($user, $file, $link));
|
||||||
|
|
||||||
|
// handle localhost installations
|
||||||
|
$server_host = OCP\Util::getServerHost();
|
||||||
|
if ($server_host === 'localhost')
|
||||||
|
$server_host = "example.com";
|
||||||
|
|
||||||
|
$default_from = 'sharing-noreply@' . $server_host;
|
||||||
|
$from_address = OCP\Config::getUserValue($user, 'settings', 'email', $default_from );
|
||||||
|
|
||||||
|
// send it out now
|
||||||
|
try {
|
||||||
|
OCP\Util::sendMail($to_address, $to_address, $subject, $text, $from_address, $user);
|
||||||
|
OCP\JSON::success();
|
||||||
|
} catch (Exception $exception) {
|
||||||
|
OCP\JSON::error(array('data' => array('message' => $exception->getMessage())));
|
||||||
|
}
|
|
@ -33,6 +33,28 @@ $(document).ready(function() {
|
||||||
});
|
});
|
||||||
OC.Share.loadIcons('file');
|
OC.Share.loadIcons('file');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$('#emailPrivateLink').live('submit', function(event) {
|
||||||
|
event.preventDefault();
|
||||||
|
var link = $('#linkText').val();
|
||||||
|
var itemType = $('#dropdown').data('item-type');
|
||||||
|
var itemSource = $('#dropdown').data('item-source');
|
||||||
|
|
||||||
|
var file = $('tr').filterAttr('data-id', String(itemSource)).data('file');
|
||||||
|
var email = $('#email').val();
|
||||||
|
if (email != '') {
|
||||||
|
$.post(OC.filePath('files_sharing', 'ajax', 'email.php'), { toaddress: email, link: link, type: itemType, file: file }, function(result) {
|
||||||
|
if (result && result.status == 'success') {
|
||||||
|
$('#email').css('font-weight', 'bold');
|
||||||
|
$('#email').animate({ fontWeight: 'normal' }, 2000, function() {
|
||||||
|
$(this).val('');
|
||||||
|
}).val('Email sent');
|
||||||
|
} else {
|
||||||
|
OC.dialogs.alert(result.data.message, 'Error while sharing');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
});
|
});
|
|
@ -50,11 +50,17 @@
|
||||||
padding-top:.5em;
|
padding-top:.5em;
|
||||||
}
|
}
|
||||||
|
|
||||||
#dropdown input[type="text"],#dropdown input[type="password"] {
|
#dropdown input[type="text"],#dropdown input[type="password"] {
|
||||||
width:90%;
|
width:90%;
|
||||||
}
|
}
|
||||||
|
|
||||||
#linkText,#linkPass,#expiration {
|
#dropdown form {
|
||||||
|
font-size: 100%;
|
||||||
|
margin-left: 0;
|
||||||
|
margin-right: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
#linkText,#linkPass,#expiration {
|
||||||
display:none;
|
display:none;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -168,6 +168,10 @@ OC.Share={
|
||||||
html += '<input id="linkPassText" type="password" placeholder="'+t('core', 'Password')+'" />';
|
html += '<input id="linkPassText" type="password" placeholder="'+t('core', 'Password')+'" />';
|
||||||
html += '</div>';
|
html += '</div>';
|
||||||
html += '</div>';
|
html += '</div>';
|
||||||
|
html += '<form id="emailPrivateLink" >';
|
||||||
|
html += '<input id="email" style="display:none; width:65%;" value="" placeholder="'+t('core', 'Email link to person')+'" type="text" />';
|
||||||
|
html += '<input id="emailButton" style="display:none;" type="submit" value="'+t('core', 'Send')+'" />';
|
||||||
|
html += '</form>';
|
||||||
}
|
}
|
||||||
html += '<div id="expiration">';
|
html += '<div id="expiration">';
|
||||||
html += '<input type="checkbox" name="expirationCheckbox" id="expirationCheckbox" value="1" /><label for="expirationCheckbox">'+t('core', 'Set expiration date')+'</label>';
|
html += '<input type="checkbox" name="expirationCheckbox" id="expirationCheckbox" value="1" /><label for="expirationCheckbox">'+t('core', 'Set expiration date')+'</label>';
|
||||||
|
@ -349,13 +353,17 @@ OC.Share={
|
||||||
$('#linkPassText').attr('placeholder', t('core', 'Password protected'));
|
$('#linkPassText').attr('placeholder', t('core', 'Password protected'));
|
||||||
}
|
}
|
||||||
$('#expiration').show();
|
$('#expiration').show();
|
||||||
|
$('#emailPrivateLink #email').show();
|
||||||
|
$('#emailPrivateLink #emailButton').show();
|
||||||
},
|
},
|
||||||
hideLink:function() {
|
hideLink:function() {
|
||||||
$('#linkText').hide('blind');
|
$('#linkText').hide('blind');
|
||||||
$('#showPassword').hide();
|
$('#showPassword').hide();
|
||||||
$('#linkPass').hide();
|
$('#linkPass').hide();
|
||||||
},
|
$('#emailPrivateLink #email').hide();
|
||||||
dirname:function(path) {
|
$('#emailPrivateLink #emailButton').hide();
|
||||||
|
},
|
||||||
|
dirname:function(path) {
|
||||||
return path.replace(/\\/g,'/').replace(/\/[^\/]*$/, '');
|
return path.replace(/\\/g,'/').replace(/\/[^\/]*$/, '');
|
||||||
},
|
},
|
||||||
showExpirationDate:function(date) {
|
showExpirationDate:function(date) {
|
||||||
|
|
Загрузка…
Ссылка в новой задаче