Added MIME decoder for SENDER.

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 728c79e0b8b8aa4e592d68201fc38c5ee83019d1..97662f41b08b0a8a3b3ce3e77c295be721cd780f 100644 (file)
--- 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>
       <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>
             <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 8abe8572fe0b3e6ad5dc6b7676e71675ddd65ad1..4dcf34b79b0d1fd78a3d992c9d745c2bd99ad593 100644 (file)
--- 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>
         <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>
         </tr>
         <tr>
           <td align="right">{$i18n.form.mail.to} (*):</td>

diff --git a/invoice_send.php b/invoice_send.php
index b9e2a29321ed17d25980d79c8d0a9bd00bf3ad62..6d85d5445db2c78518de89b25e2c18212f7e30be 100644 (file)
--- a/invoice_send.php
+++ b/invoice_send.php
@@ -94,6 +94,16 @@ if ($request->isPost()) {
   }
 } // 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()"');
 $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 e11978aa051a10ac7fdbd804bc83ddd916cf8471..9c02ced7956f5597909b0c039cd46ecfebfb2ec7 100644 (file)
--- 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()"');
 $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()"');