summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorBjoern Schiessle <schiessle@owncloud.com>2013-09-30 10:02:26 +0200
committerBjoern Schiessle <schiessle@owncloud.com>2013-09-30 10:02:26 +0200
commitb9a1f6334482ae181609e262c11c378e1d0f6109 (patch)
treeb4e8e2ea929c1b861dcd61c45a758d562bc24714 /core
parentacd3c11e47212e3b9d59a914cea408637582bb06 (diff)
downloadnextcloud-server-b9a1f6334482ae181609e262c11c378e1d0f6109.tar.gz
nextcloud-server-b9a1f6334482ae181609e262c11c378e1d0f6109.zip
go back to old template but add expire date as optional content
Diffstat (limited to 'core')
-rw-r--r--core/templates/altmail.php10
-rw-r--r--core/templates/mail.php11
2 files changed, 15 insertions, 6 deletions
diff --git a/core/templates/altmail.php b/core/templates/altmail.php
index f7159a021a8..5df43b50776 100644
--- a/core/templates/altmail.php
+++ b/core/templates/altmail.php
@@ -1,7 +1,11 @@
<?php
-$expiration = isset($_['expiration']) ? $_['expiration'] : null;
-print_unescaped($theme->getShareNotificationTextAlt($_['user_displayname'], $_['filename'], $_['link'], $expiration));
+print_unescaped($l->t("Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n", array($_['user_displayname'], $_['filename'], $_['link'])));
+if ( isset($_['expiration']) ) {
+ print_unescaped($l->t("The share will expire at %s.\n\n", array($_['expiration'])));
+}
+p($l->t("Cheers!"));
?>
--
-<?php print_unescaped($theme->getMailFooterAlt());
+<?php p($theme->getName() . ' - ' . $theme->getSlogan()); ?>
+<?php print_unescaped("\n".$theme->getBaseUrl());
diff --git a/core/templates/mail.php b/core/templates/mail.php
index 5570e4caabe..1464d2be2f4 100644
--- a/core/templates/mail.php
+++ b/core/templates/mail.php
@@ -12,8 +12,11 @@
<td bgcolor="#f8f8f8" width="20px">&nbsp;</td>
<td bgcolor="#f8f8f8" style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">
<?php
-$expiration = isset($_['expiration']) ? $_['expiration'] : null;
-print_unescaped($theme->getShareNotificationTextHtml($_['user_displayname'], $_['filename'], $_['link'], $expiration));
+print_unescaped($l->t('Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href="%s">View it!</a><br><br>', array($_['user_displayname'], $_['filename'], $_['link'])));
+if ( isset($_['expiration']) ) {
+ print_unescaped($l->t("The share will expire at %s.<br><br>", array($_['expiration'])));
+}
+p($l->t('Cheers!'));
?>
</td>
</tr>
@@ -21,7 +24,9 @@ print_unescaped($theme->getShareNotificationTextHtml($_['user_displayname'], $_[
<tr>
<td bgcolor="#f8f8f8" width="20px">&nbsp;</td>
<td bgcolor="#f8f8f8" style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">--<br>
-<?php print_unescaped($theme->getMailFooterHtml()); ?>
+<?php p($theme->getName()); ?> -
+<?php p($theme->getSlogan()); ?>
+<br><a href="<?php print_unescaped($theme->getBaseUrl()); ?>"><?php print_unescaped($theme->getBaseUrl());?></a>
</td>
</tr>
<tr>