Merge pull request #3733 from owncloud/email_template

E-mail templates (#3683)

1 files changed, 14 insertions, 9 deletions

diff --git a/core/ajax/share.php b/core/ajax/share.php
index 5854b65aa03..bdcb61284ec 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -94,23 +94,28 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
 			$l = OC_L10N::get('core');
 
 			// setup the email
-			$subject = (string)$l->t('User %s shared a file with you', $displayName);
-			if ($type === 'folder')
-				$subject = (string)$l->t('User %s shared a folder with you', $displayName);
+			$subject = (string)$l->t('%s shared »%s« with you', array($displayName, $file));
 
-			$text = (string)$l->t('User %s shared the file "%s" with you. It is available for download here: %s',
-				array($displayName, $file, $link));
-			if ($type === 'folder')
-				$text = (string)$l->t('User %s shared the folder "%s" with you. It is available for download here: %s',
-					array($displayName, $file, $link));
+			$content = new OC_Template("core", "mail", "");
+			$content->assign ('link', $link);
+			$content->assign ('type', $type);
+			$content->assign ('user_displayname', $displayName);
+			$content->assign ('filename', $file);
+			$text = $content->fetchPage();
 
+			$content = new OC_Template("core", "altmail", "");
+			$content->assign ('link', $link);
+			$content->assign ('type', $type);
+			$content->assign ('user_displayname', $displayName);
+			$content->assign ('filename', $file);
+			$alttext = $content->fetchPage();
 
 			$default_from = OCP\Util::getDefaultEmailAddress('sharing-noreply');
 			$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, $displayName);
+				OCP\Util::sendMail($to_address, $to_address, $subject, $text, $from_address, $displayName, 1, $alttext);
 				OCP\JSON::success();
 			} catch (Exception $exception) {
 				OCP\JSON::error(array('data' => array('message' => OC_Util::sanitizeHTML($exception->getMessage()))));