Index: branches/5.2.x/core/units/forms/submission_log/submission_log_eh.php =================================================================== diff -u -N -r13840 -r14095 --- branches/5.2.x/core/units/forms/submission_log/submission_log_eh.php (.../submission_log_eh.php) (revision 13840) +++ branches/5.2.x/core/units/forms/submission_log/submission_log_eh.php (.../submission_log_eh.php) (revision 14095) @@ -1,6 +1,6 @@ getForm($form_submission); $from_email = $form->GetDBField('ReplyFromEmail'); - $to_email = $form_submission_helper->getFieldByRole($form_submission, EMAIL_COMMUNICATION_ROLE_EMAIL); + $to_email = $form_submission_helper->getFieldByRole($form_submission, SubmissionFormField::COMMUNICATION_ROLE_EMAIL); if ($this->Application->GetVar('client_mode')) { // debug code for sending email from client @@ -131,7 +131,7 @@ if (!$replies_found) { // 1st message from admin -> quote subject & text from feedback - $message_subject = $form_submission_helper->getFieldByRole($form_submission, EMAIL_COMMUNICATION_ROLE_SUBJECT, true); + $message_subject = $form_submission_helper->getFieldByRole($form_submission, SubmissionFormField::COMMUNICATION_ROLE_SUBJECT, true); if ($message_subject) { $object->SetDBField('Subject', $this->_transformSubject($message_subject, 'Re')); @@ -141,7 +141,7 @@ $message_body = $form->GetDBField('ReplyMessageSignature'); // add replied marks - $original_message_body = $form_submission_helper->getFieldByRole($form_submission, EMAIL_COMMUNICATION_ROLE_BODY); + $original_message_body = $form_submission_helper->getFieldByRole($form_submission, SubmissionFormField::COMMUNICATION_ROLE_BODY); if ($original_message_body) { $message_body .= '> ' . preg_replace('/([\r]*\n)/', '\\1> ', $original_message_body); @@ -293,7 +293,7 @@ $object->GetDBField('FromEmail'), $object->GetDBField('ToEmail'), $object->GetID(), - getmicrotime() + microtime(true) ); $object->SetDBField('VerifyCode', md5( implode('-', $code) )); @@ -331,7 +331,7 @@ 'message' => $object->GetDBField('Message'), ); - $to_name = $form_submission_helper->getFieldByRole($form_submission, EMAIL_COMMUNICATION_ROLE_NAME); + $to_name = $form_submission_helper->getFieldByRole($form_submission, SubmissionFormField::COMMUNICATION_ROLE_NAME); if ($to_name) { $send_params['to_name'] = $to_name;