diff options
author | Thomas Mueller <thomas.mueller@tmit.eu> | 2012-12-10 23:22:42 +0100 |
---|---|---|
committer | Thomas Mueller <thomas.mueller@tmit.eu> | 2012-12-10 23:22:42 +0100 |
commit | 162a2c0fba6f7d7be3aa2372554e4a77a70a3e00 (patch) | |
tree | 733323b13feb40ef6e52d326b691d078b6f3bda4 /apps | |
parent | 45074d5023d408f4f81bc45380ce68b1008f9414 (diff) | |
download | nextcloud-server-162a2c0fba6f7d7be3aa2372554e4a77a70a3e00.tar.gz nextcloud-server-162a2c0fba6f7d7be3aa2372554e4a77a70a3e00.zip |
moving sharing email code to core
Diffstat (limited to 'apps')
-rw-r--r-- | apps/files_sharing/ajax/email.php | 39 | ||||
-rw-r--r-- | apps/files_sharing/js/share.js | 26 |
2 files changed, 1 insertions, 64 deletions
diff --git a/apps/files_sharing/ajax/email.php b/apps/files_sharing/ajax/email.php deleted file mode 100644 index 4ed4eef723a..00000000000 --- a/apps/files_sharing/ajax/email.php +++ /dev/null @@ -1,39 +0,0 @@ -<?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()))); -} diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js index a83252867a9..8a546d62163 100644 --- a/apps/files_sharing/js/share.js +++ b/apps/files_sharing/js/share.js @@ -33,28 +33,4 @@ $(document).ready(function() { }); 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'); - } - }); - } - }); - - -});
\ No newline at end of file +}); |