go back to old template but add expire date as optional content

diff --git a/core/templates/altmail.php b/core/templates/altmail.php
index f7159a021a8cf811149f989d3e49c98e741e878d..5df43b5077653c1b3a19cc754235c5d46403d643 100644 (file)
--- 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 5570e4caabe0b1e3431a55b18286f5fabb9d6b85..1464d2be2f4b63f8868c1c505420727db53f52d1 100644 (file)
--- 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>