From: Stephan Arts Date: Fri, 14 Jun 2013 15:38:56 +0000 (+0200) Subject: Use templates to theme share e-mails (#3683) X-Git-Tag: v6.0.0alpha2~626^2~2 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3cd7747e7b9c10449f986e5f696a01cf4e50c318;p=nextcloud-server.git Use templates to theme share e-mails (#3683) --- 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())))); diff --git a/core/img/logo-mail.gif b/core/img/logo-mail.gif new file mode 100644 index 00000000000..6a1caaa9188 Binary files /dev/null and b/core/img/logo-mail.gif differ diff --git a/core/templates/altmail.php b/core/templates/altmail.php new file mode 100644 index 00000000000..4bac3254d93 --- /dev/null +++ b/core/templates/altmail.php @@ -0,0 +1,9 @@ +t("Hey there,\n\njust letting you know that %s shared »%s« with you.\nView it: %s\n\nCheers!", array($_['user_displayname'], $_['filename'], $_['link']))); +?> + +-- +t("ownCloud – web services under your control")); +?> +http://ownCloud.org diff --git a/core/templates/mail.php b/core/templates/mail.php new file mode 100644 index 00000000000..060e007d339 --- /dev/null +++ b/core/templates/mail.php @@ -0,0 +1,33 @@ + + +
+ + + + + + + + + + + + + + + + + + +
  +ownCloud +
 
  +t('Hey there,

just letting you know that %s shared »%s« with you.
View it!

Cheers!', array($_['user_displayname'], $_['filename'], $_['link']))); +?> +
 
 --
+t('ownCloud - web services under your control')); +?> +
http://ownCloud.org
 
+