X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=invoice_send.php;h=bc290a6662ebb3db2dc3a2250b0568b35c108c7a;hb=ac5189157ef60820dd125400baee9f408a9ba2ea;hp=fba99ca326a585d037625fc90f4231e43d65dd3a;hpb=9e82b53fc5d8cb1e54b5fde774fa68a916f28b4c;p=timetracker.git

diff --git a/invoice_send.php b/invoice_send.php
index fba99ca3..bc290a66 100644
--- a/invoice_send.php
+++ b/invoice_send.php
@@ -32,7 +32,7 @@ import('ttInvoiceHelper');
 import('ttSysConfig');
 
 // Access check.
-if (!ttAccessCheck(right_view_invoices)) {
+if (!ttAccessCheck(right_view_invoices) || !$user->isPluginEnabled('iv')) {
   header('Location: access_denied.php');
   exit();
 }
@@ -86,13 +86,23 @@ if ($request->isPost()) {
     $mailer->setReceiver($cl_receiver);
     if (isset($cl_cc))
       $mailer->setReceiverCC($cl_cc);
-    $mailer->setSendType(MAIL_MODE);
+    $mailer->setMailMode(MAIL_MODE);
     if ($mailer->send($cl_subject, $body))
-      $messages->add($i18n->getKey('form.mail.invoice_sent'));
+      $msg->add($i18n->getKey('form.mail.invoice_sent'));
     else
       $err->add($i18n->getKey('error.mail_send'));
   }
-} // POST
+} // 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()));