From 0500643b9779299b1a643256bf291367528170ff Mon Sep 17 00:00:00 2001
From: anuko <support@anuko.com>
Date: Sat, 4 Feb 2017 20:42:36 +0000
Subject: [PATCH] Added MIME decoder for SENDER.

---
 WEB-INF/templates/footer.tpl |  2 +-
 WEB-INF/templates/mail.tpl   |  2 +-
 invoice_send.php             | 10 ++++++++++
 report_send.php              | 10 ++++++++++
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 728c79e0..97662f41 100644
--- a/WEB-INF/templates/footer.tpl
+++ b/WEB-INF/templates/footer.tpl
@@ -12,7 +12,7 @@
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>
-          <td align="center">&nbsp;Anuko Time Tracker 1.9.35.3558 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.9.36.3559 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
             <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
             <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
             <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>
diff --git a/WEB-INF/templates/mail.tpl b/WEB-INF/templates/mail.tpl
index 8abe8572..4dcf34b7 100644
--- a/WEB-INF/templates/mail.tpl
+++ b/WEB-INF/templates/mail.tpl
@@ -8,7 +8,7 @@
         <table>
         <tr>
           <td align="right">{$i18n.form.mail.from} (*):</td>
-          <td>{$smarty.const.SENDER}</td>
+          <td>{$sender}</td>
         </tr>
         <tr>
           <td align="right">{$i18n.form.mail.to} (*):</td>
diff --git a/invoice_send.php b/invoice_send.php
index b9e2a293..6d85d544 100644
--- a/invoice_send.php
+++ b/invoice_send.php
@@ -94,6 +94,16 @@ if ($request->isPost()) {
   }
 } // isPost
 
+$smarty->assign('sender', SENDER);
+if (function_exists('imap_mime_header_decode')) {
+  // Decode sender in case it is encoded. PHP IMAP extension must be installed for us to get here.
+  $elements = imap_mime_header_decode(SENDER);
+  if (count($elements) > 1) {
+      // Reassign sender.
+      $smarty->assign('sender', $elements[count($elements) - 2]->text);
+  }
+}
+
 $smarty->assign('title', $i18n->getKey('title.send_invoice'));
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.mailForm.'.($cl_receiver?'comment':'receiver').'.focus()"');
diff --git a/report_send.php b/report_send.php
index e11978aa..9c02ced7 100644
--- a/report_send.php
+++ b/report_send.php
@@ -91,6 +91,16 @@ if ($request->isPost()) {
   }
 }
 
+$smarty->assign('sender', SENDER);
+if (function_exists('imap_mime_header_decode')) {
+  $elements = imap_mime_header_decode(SENDER);
+  if (count($elements) > 1) {
+      // Reassign sender.
+      $new = $elements[count($elements) - 2]->text;
+      $smarty->assign('sender', $elements[count($elements) - 2]->text);
+  }
+}
+
 $smarty->assign('title', $i18n->getKey('title.send_report'));
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.mailForm.'.($cl_receiver?'comment':'receiver').'.focus()"');
-- 
2.20.1