nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2026-01-06 11:43:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Email Queue - Job & Service: Fix variable issues to mitigate errors.

Browse Source
This commit is contained in:
fusionate
2023-08-01 00:14:00 +00:00
parent 2c298113f6
commit d4d5799342
2 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/email_queue/resources/jobs/email_send.php
View File

@@ -29,8 +29,8 @@
if (is_uuid($_GET['email_queue_uuid'])) { if (is_uuid($_GET['email_queue_uuid'])) {
$email_queue_uuid = $_GET['email_queue_uuid']; $email_queue_uuid = $_GET['email_queue_uuid'];
$hostname = urldecode($_GET['hostname']); $hostname = urldecode($_GET['hostname']);
$debug = $_GET['debug']; $debug = $_GET['debug'] ?? null;
$sleep_seconds = $_GET['sleep']; $sleep_seconds = $_GET['sleep'] ?? null;
} }
else { else {
//invalid uuid //invalid uuid
@@ -84,7 +84,7 @@
//create the process id file if the process doesn't exist //create the process id file if the process doesn't exist
if (!$pid_exists) { if (!$pid_exists) {
//remove the old pid file //remove the old pid file
if (file_exists($file)) { if (!empty($pid_file) && file_exists($pid_file)) {
unlink($pid_file); unlink($pid_file);
} }
@@ -284,6 +284,7 @@
} }
//add email settings //add email settings
$email_settings = '';
ksort($_SESSION['email']); ksort($_SESSION['email']);
foreach ($_SESSION['email'] as $name => $setting) { foreach ($_SESSION['email'] as $name => $setting) {
foreach ($setting as $type => $value) { foreach ($setting as $type => $value) {
@@ -293,11 +294,27 @@
} }
} }
//parse email and name
if (!empty($email_from)) {
if (valid_email($email_from)) {
$email_from_address = $email_from;
}
else {
$lt_pos = strpos($email_from, '<');
if ($lt_pos !== false) {
$email_from_address = str_replace('>', '', substr($email_from, $lt_pos + 1));
$email_from_name = trim(substr($email_from, 0, $lt_pos));
}
}
}
//send the email //send the email
$email = new email; $email = new email;
$email->domain_uuid = $domain_uuid; $email->domain_uuid = $domain_uuid;
$email->from_address = $email_from_address; $email->from_address = $email_from_address;
$email->from_name = $email_from_name; if (!empty($email_from_name)) {
$email->from_name = $email_from_name;
}
$email->recipients = $email_to; $email->recipients = $email_to;
$email->subject = $email_subject; $email->subject = $email_subject;
$email->body = $email_body; $email->body = $email_body;

2
app/email_queue/resources/service/email_queue.php
View File

@@ -104,7 +104,7 @@
//create the process id file if the process doesn't exist //create the process id file if the process doesn't exist
if (!$pid_exists) { if (!$pid_exists) {
//remove the old pid file //remove the old pid file
if (file_exists($file)) { if (file_exists($pid_file)) {
unlink($pid_file); unlink($pid_file);
} }