X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=report_send.php;h=e11978aa051a10ac7fdbd804bc83ddd916cf8471;hb=660a3e8ca761113f8e1b739dba11eddf7f581cbd;hp=d8a0690d87e2690ddf2283bcd43cbb1839971624;hpb=4426ed3bc8e53d5013d356505283c916e3826392;p=timetracker.git diff --git a/report_send.php b/report_send.php index d8a0690d..e11978aa 100644 --- a/report_send.php +++ b/report_send.php @@ -40,7 +40,7 @@ if (!ttAccessCheck(right_view_reports)) { $sc = new ttSysConfig($user->id); -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')); @@ -58,14 +58,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->isEmpty()) { + if ($err->no()) { // Save last report emails for future use. $sc->setValue(SYSC_LAST_REPORT_EMAIL, $cl_receiver); $sc->setValue(SYSC_LAST_REPORT_CC, $cl_cc); @@ -85,9 +85,9 @@ if ($request->getMethod() == 'POST') { $mailer->setReceiverCC($cl_cc); $mailer->setSendType(MAIL_MODE); if ($mailer->send($cl_subject, $body)) - $messages->add($i18n->getKey('form.mail.report_sent')); + $msg->add($i18n->getKey('form.mail.report_sent')); else - $errors->add($i18n->getKey('error.mail_send')); + $err->add($i18n->getKey('error.mail_send')); } }