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

email_send_remove_extra_database_objects (#7034) 

Use a single instance of the object instead
This commit is contained in:
frytimo 2024-07-04 14:53:44 -03:00 committed by GitHub
parent 2b87349e7d
commit 766aeeefae
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -125,7 +125,7 @@
$sql = "select * from v_email_queue "; $sql = "select * from v_email_queue ";
$sql .= "where email_queue_uuid = :email_queue_uuid "; $sql .= "where email_queue_uuid = :email_queue_uuid ";
$parameters['email_queue_uuid'] = $email_queue_uuid; $parameters['email_queue_uuid'] = $email_queue_uuid;
$database = new database; $database = new database();
$row = $database->select($sql, $parameters, 'row'); $row = $database->select($sql, $parameters, 'row');
if (is_array($row)) { if (is_array($row)) {
$domain_uuid = $row["domain_uuid"]; $domain_uuid = $row["domain_uuid"];
@ -144,7 +144,7 @@
unset($parameters); unset($parameters);
//get the email queue settings //get the email queue settings
$settings = new settings(["domain_uuid" => $domain_uuid]); $settings = new settings(["database" => $database,"domain_uuid" => $domain_uuid]);
//get the email settings //get the email settings
$retry_limit = $settings->get('email_queue', 'retry_limit'); $retry_limit = $settings->get('email_queue', 'retry_limit');
@ -163,7 +163,6 @@
$sql .= " where voicemail_message_uuid = :voicemail_message_uuid "; $sql .= " where voicemail_message_uuid = :voicemail_message_uuid ";
$sql .= ") "; $sql .= ") ";
$parameters['voicemail_message_uuid'] = $email_uuid; $parameters['voicemail_message_uuid'] = $email_uuid;
$database = new database;
$row = $database->select($sql, $parameters, 'row'); $row = $database->select($sql, $parameters, 'row');
if (is_array($row)) { if (is_array($row)) {
//$domain_uuid = $row["domain_uuid"]; //$domain_uuid = $row["domain_uuid"];
@ -189,7 +188,6 @@
$sql = "select * from v_email_queue_attachments "; $sql = "select * from v_email_queue_attachments ";
$sql .= "where email_queue_uuid = :email_queue_uuid "; $sql .= "where email_queue_uuid = :email_queue_uuid ";
$parameters['email_queue_uuid'] = $email_queue_uuid; $parameters['email_queue_uuid'] = $email_queue_uuid;
$database = new database;
$email_queue_attachments = $database->select($sql, $parameters, 'all'); $email_queue_attachments = $database->select($sql, $parameters, 'all');
if (is_array($email_queue_attachments) && @sizeof($email_queue_attachments) != 0) { if (is_array($email_queue_attachments) && @sizeof($email_queue_attachments) != 0) {
foreach($email_queue_attachments as $i => $field) { foreach($email_queue_attachments as $i => $field) {
@ -298,7 +296,6 @@
$parameters['message_transcription'] = $transcribe_message; $parameters['message_transcription'] = $transcribe_message;
//echo $sql."\n"; //echo $sql."\n";
//print_r($parameters); //print_r($parameters);
$database = new database;
$database->execute($sql, $parameters); $database->execute($sql, $parameters);
unset($parameters); unset($parameters);
} }
@ -369,7 +366,6 @@
$sql .= "update_date = now() "; $sql .= "update_date = now() ";
$sql .= "where email_queue_uuid = :email_queue_uuid; "; $sql .= "where email_queue_uuid = :email_queue_uuid; ";
$parameters['email_queue_uuid'] = $email_queue_uuid; $parameters['email_queue_uuid'] = $email_queue_uuid;
$database = new database;
$database->execute($sql, $parameters); $database->execute($sql, $parameters);
unset($parameters); unset($parameters);
@ -395,7 +391,6 @@
$parameters['voicemail_message_uuid'] = $email_uuid; $parameters['voicemail_message_uuid'] = $email_uuid;
//echo $sql."\n"; //echo $sql."\n";
//print_r($parameters); //print_r($parameters);
$database = new database;
$database->execute($sql, $parameters); $database->execute($sql, $parameters);
unset($parameters); unset($parameters);
@ -403,7 +398,6 @@
$sql = "select domain_name from v_domains "; $sql = "select domain_name from v_domains ";
$sql .= "where domain_uuid = :domain_uuid "; $sql .= "where domain_uuid = :domain_uuid ";
$parameters['domain_uuid'] = $domain_uuid; $parameters['domain_uuid'] = $domain_uuid;
$database = new database;
$domain_name = $database->select($sql, $parameters, 'column'); $domain_name = $database->select($sql, $parameters, 'column');
//send the message waiting status //send the message waiting status
@ -430,7 +424,6 @@
$p->add('email_queue_add', 'temp'); $p->add('email_queue_add', 'temp');
$p->add('email_queue_update', 'temp'); $p->add('email_queue_update', 'temp');
//execute insert //execute insert
$database = new database;
$database->app_name = 'email_queue'; $database->app_name = 'email_queue';
$database->app_uuid = '5befdf60-a242-445f-91b3-2e9ee3e0ddf7'; $database->app_uuid = '5befdf60-a242-445f-91b3-2e9ee3e0ddf7';
print_r($array); print_r($array);
@ -462,7 +455,6 @@
$p->add('email_queue_add', 'temp'); $p->add('email_queue_add', 'temp');
//execute insert //execute insert
$database = new database;
$database->app_name = 'email_queue'; $database->app_name = 'email_queue';
$database->app_uuid = 'ba41954e-9d21-4b10-bbc2-fa5ceabeb184'; $database->app_uuid = 'ba41954e-9d21-4b10-bbc2-fa5ceabeb184';
$database->save($array); $database->save($array);
@ -490,7 +482,6 @@
$parameters['email_queue_uuid'] = $email_queue_uuid; $parameters['email_queue_uuid'] = $email_queue_uuid;
$parameters['email_response'] = $email_settings."\n".$email_response; $parameters['email_response'] = $email_settings."\n".$email_response;
$parameters['email_retry_count'] = $email_retry_count; $parameters['email_retry_count'] = $email_retry_count;
$database = new database;
$database->execute($sql, $parameters); $database->execute($sql, $parameters);
unset($parameters); unset($parameters);
@ -517,7 +508,6 @@
$p = new permissions; $p = new permissions;
$p->add('email_log_add', 'temp'); $p->add('email_log_add', 'temp');
//execute insert //execute insert
$database = new database;
$database->app_name = 'v_mailto'; $database->app_name = 'v_mailto';
$database->app_uuid = 'ba41954e-9d21-4b10-bbc2-fa5ceabeb184'; $database->app_uuid = 'ba41954e-9d21-4b10-bbc2-fa5ceabeb184';
$database->save($array); $database->save($array);