dbxe/fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Save the email response (#6558)

Browse Source 
* Save the email response

* use the response variable from the email class

* Rename email_debug to email_response

* Update app_languages.php

* Show the email response

* Save the email response
This commit is contained in:
FusionPBX
2023-02-17 12:47:11 -07:00
committed by GitHub
parent 7dbfd22acb
commit 97dbe7b31a
6 changed files with 62 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/email_queue/resources/jobs/email_send.php
+14 -11
View File
@@ -235,7 +235,6 @@
//echo "email_body before: ".$email_body."\n";
$email_body = str_replace('${message_text}', $transcribe_message, $email_body);
//$email_debug = $field['message'];
//echo "email_body after: ".$email_body."\n";
//unset($field);
}
@@ -286,11 +285,8 @@
unset($parameters);
}
//send email
//ob_start();
//$sent = !send_email($email_to, $email_subject, $email_body, $email_error, null, null, null, null, $email_attachments) ? false : true;
//$response = ob_get_clean();
//echo $response;
//save output to a buffer
// ob_start();
//send the email
$email = new email;
@@ -301,12 +297,17 @@
$email->subject = $email_subject;
$email->body = $email_body;
$email->attachments = $email_attachments;
$email->debug_level = 3;
$email->method = 'direct';
$email_response = $email->send();
$email_error = $email->email_error;
$email_status = $email->send();
$email_error = $email->error;
$email_response = $email->response;
//get the output buffer
// //$email_response = ob_get_clean();
//send the email
if ($email_response) {
if ($email_status) {
//set the email status to sent
$sql = "update v_email_queue ";
@@ -315,9 +316,11 @@
if (isset($transcribe_message)) {
$sql .= "email_transcription = :email_transcription, ";
}
$sql .= "email_response = :email_response, ";
$sql .= "update_date = now() ";
$sql .= "where email_queue_uuid = :email_queue_uuid; ";
$parameters['email_queue_uuid'] = $email_queue_uuid;
$parameters['email_response'] = $email_response;
if (isset($transcribe_message)) {
$parameters['email_transcription'] = $transcribe_message;
}
@@ -437,12 +440,12 @@
else {
$sql .= "set email_status = 'trying', ";
}
$sql .= "email_debug = :email_debug, ";
$sql .= "email_response = :email_response, ";
$sql .= "email_retry_count = :email_retry_count, ";
$sql .= "update_date = now() ";
$sql .= "where email_queue_uuid = :email_queue_uuid; ";
$parameters['email_queue_uuid'] = $email_queue_uuid;
$parameters['email_debug'] = $mailer_error;
$parameters['email_response'] = $email_response;
$parameters['email_retry_count'] = $email_retry_count;
$database = new database;
$database->execute($sql, $parameters);