X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=invoice_send.php;h=e519132d6ab5c934447e2925da6cf5e413f97b13;hb=ff71ab051012b2ac0664f08603b8c6455feba5db;hp=18d8db6bae1085d7780338a08d5d2f68ee63164d;hpb=1fad211ab12fc66117094e33425f8414fccd2cfa;p=timetracker.git diff --git a/invoice_send.php b/invoice_send.php index 18d8db6b..e519132d 100644 --- a/invoice_send.php +++ b/invoice_send.php @@ -45,7 +45,7 @@ $sc = new ttSysConfig($user->id); if (!$cl_invoice_id || !$invoice) die ($i18n->getKey('error.sys')); -if ($request->getMethod() == 'POST') { +if ($request->isPost()) { $cl_receiver = trim($request->getParameter('receiver')); $cl_cc = trim($request->getParameter('cc')); $cl_subject = trim($request->getParameter('subject')); @@ -64,14 +64,14 @@ $form->addInput(array('type'=>'text','name'=>'subject','style'=>'width: 300px;', $form->addInput(array('type'=>'textarea','name'=>'comment','maxlength'=>'250','style'=>'width: 300px; height: 60px;')); $form->addInput(array('type'=>'submit','name'=>'btn_send','value'=>$i18n->getKey('button.send'))); -if ($request->getMethod() == 'POST') { +if ($request->isPost()) { // Validate user input. - if (!ttValidEmailList($cl_receiver)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('form.mail.to')); - if (!ttValidEmailList($cl_cc, true)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('form.mail.cc')); - if (!ttValidString($cl_subject)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('form.mail.subject')); - if (!ttValidString($cl_comment, true)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.comment')); + if (!ttValidEmailList($cl_receiver)) $err->add($i18n->getKey('error.field'), $i18n->getKey('form.mail.to')); + if (!ttValidEmailList($cl_cc, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('form.mail.cc')); + if (!ttValidString($cl_subject)) $err->add($i18n->getKey('error.field'), $i18n->getKey('form.mail.subject')); + if (!ttValidString($cl_comment, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.comment')); - if ($errors->no()) { + if ($err->no()) { // Save last invoice emails for future use. $sc->setValue(SYSC_LAST_INVOICE_EMAIL, $cl_receiver); $sc->setValue(SYSC_LAST_INVOICE_CC, $cl_cc); @@ -88,11 +88,11 @@ if ($request->getMethod() == 'POST') { $mailer->setReceiverCC($cl_cc); $mailer->setSendType(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 - $errors->add($i18n->getKey('error.mail_send')); + $err->add($i18n->getKey('error.mail_send')); } -} // POST +} // isPost $smarty->assign('title', $i18n->getKey('title.send_invoice')); $smarty->assign('forms', array($form->getName()=>$form->toArray()));