From 3cd7747e7b9c10449f986e5f696a01cf4e50c318 Mon Sep 17 00:00:00 2001 From: Stephan Arts Date: Fri, 14 Jun 2013 17:38:56 +0200 Subject: [PATCH] Use templates to theme share e-mails (#3683) --- core/ajax/share.php | 23 ++++++++++++++--------- core/img/logo-mail.gif | Bin 0 -> 2196 bytes core/templates/altmail.php | 9 +++++++++ core/templates/mail.php | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 56 insertions(+), 9 deletions(-) create mode 100644 core/img/logo-mail.gif create mode 100644 core/templates/altmail.php create mode 100644 core/templates/mail.php 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 0000000000000000000000000000000000000000..6a1caaa9188d02bb3001b74d3525d77b58934d2a GIT binary patch literal 2196 zcmcK4i9geg0|)T$He=3a$+KL|)x#*WTv48Fj5*sJx#pHz?ve-1oZGCHyO1--qFj%J zJagstNbV>TB}$4O>FKGT=a2ZkU!OnW^ZA%tm>KAMmjP(tEda=$GF3QDJfTHIX_+Zv z%oVjsN?4Ne84DF1OI01Kle$*F>RGGl+o&7Zs-Lw*pS_@ANY*qWpE^f5ecn#%ygkO) z9`l=nHqH@?zoonl^PJ|9(c_oDBd$T-ZSKPuh0bV&;*~bMBmFv ze&N^sBWVFq^uTC(P)tg2Y-&hsTIiLuu&e2p<1)gpWrW9PM#M9s5}476teB*%E7#fA zQaJG`w|-B}PDsm6OwUQm$W6-3yPlaxW8^0@3+SxEl&r#3_U$zGo%9<;={JiqIK`Q_ zN*K3FnAvw(Ii*>-W$e7N8~Noo@+)o@RB{R{Z{4oSDXPvbs?IB}$uFtRzgt^ST31-g zy~H$VEb^>NQ19X)NGeUG~O+n@A5?jGpm4R-McpY#kp=^gIw z8|Dp+_6&^mJ{{{D9Pb~R7#RNR>B!{Z=(C}*sp0Xdk%{M{6VqdpGvm)@C#L59dOkP# zeE!+=!qm*-^V!Aexfj!OOEdG!vkS{}i!bM2yjoa#wYaqMVwu16a&_s|>hj9#m;AL? z{PmU9b^hx&t7~sxuWzg!=FPkHx0`P^Hs8M6+Sq*mZu7(D)`zY4+wZq`K78Eyxbu1E z)9$CwySuwzcK5z~`FsEG{jd994;>sFeEat8pZ|RS{{7!WKMwu;`SY-)|EFjIhyL3F z0Q&)eU~;6!vYr&!Q8aa^vAiz>u54LMYN{AuAKt=_4P396 zu4YU>Y!al(Yan`?OQ^WSe@E!`Za2f3ZM3$F+yxYl|iG!DM! zE=Hl)`qxV&e(kWCt1&CR5-GZ0J8tWxg=BeTnsOL|Ms1pnZM#y^Fl1JtHk}VTc9OwF zS7JK$@fuy->!EaXK$D6FMqQ)BI)^0}a5Y|JrSluqhNuk{*53pbg~fLM7#@am)v`99 z$V=sjNSMnY8U(j;iQwlGdK>0iuA_ChQwK)x=*ilKvAxJ6HDv-&RcT2|0pbea?4Y3A zZfAZ(eT|IwgrSF4OyNlQjMIam6?Ur8wKEXW!q9ws?Co|=u7JBi@8}UACT@x@3Bofl z{6JvL)wq`KL*ahiIi?@^-Z2L;gd`A!!E1#pH%{pF^ArtZcL4*>pcI;(`L;^+nGiN% z*_t`sOu!r7>Gw5(tu))~%GAe-ie8c)@NxGW%Y~w$NT~peXske{!x5F;W2&xuk8`9` zrqjfQ)q;4|Fd=zMy9$v7z@LK6a(0lXlejskXt7x#%O5F?$($PHiuDPz6DkPi^iw z!3|yI)h5!Tdl)H1+@#c_bI{1XafFICpsH!Ii}NTZEDLw4tksG4Q^|1o!^7FezZaSA zJAD-Cw~NOmK_?_lGb>DV499m^Ke&I6p**pI?g+sdik4eD&YqP$fUhQjXoILebu7>d zcuxXN&fC~U%)VV8K3vw1>##&B$8{MV>rLajFDZI1K+k#$^CuJ}X#Eg}79QRMt^|M7 z!d#;1gh)@P%bzL@BQGM=Qpg+71J^mU<+ctRTDj+9DSCP~FCC9wA^g+VW<@1v!9LKK zxF*319MNV}zo{y)hhu)!;AC7{f`2&}C@YtZ{q$6(7?ncDd{75qW)iUMjEER3)ODN!R5ZIkxs}0! zXw!6KaPUS38|5cE1dsYeYw8gLEDO`DVOYQ$15z5uw$$>Ogv@TFN{@hfz&ysJF3>~* zRRq%Ro?;!J{)h~tB|{KxjmbM+$0Go|1VT~_BW5D5fINwj^D<49ib9dI5qScip&nl4 z$pGs1Fu59=FKjCQv>gmnnuJ`a&q7712_7>>!DSujNs<&A{3VBBv*RuNHc14e9K{zt zrN%}H(t4z&%0-Bwih@EI5~KnSb8=9YPHU(8U^axD$q<)1xlB=GNpTOUUNFE*RxPH8 z5lBF!dHo7hl%OojC!r{1#N#l;gUGxss!g#erb3Zt("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
 
+
-- 2.39.5