mirror of
https://github.com/fusionpbx/fusionpbx.git
synced 2026-01-06 11:43:50 +00:00
Remove redundant database instances (#7535)
This commit is contained in:
@@ -73,11 +73,6 @@
|
||||
$x++;
|
||||
}
|
||||
|
||||
//prepare the database object
|
||||
$database = new database;
|
||||
$database->app_name = 'email_queue';
|
||||
$database->app_uuid = '5befdf60-a242-445f-91b3-2e9ee3e0ddf7';
|
||||
|
||||
//send the array to the database class
|
||||
switch ($action) {
|
||||
case 'resend':
|
||||
@@ -138,7 +133,6 @@
|
||||
// $sql .= "where (domain_uuid = :domain_uuid or domain_uuid is null) ";
|
||||
// $parameters['domain_uuid'] = $domain_uuid;
|
||||
//}
|
||||
$database = new database;
|
||||
$num_rows = $database->select($sql, $parameters ?? null, 'column');
|
||||
unset($sql, $parameters);
|
||||
|
||||
@@ -186,7 +180,6 @@
|
||||
$sql .= order_by($order_by, $order, 'email_date', 'desc');
|
||||
$sql .= limit_offset($rows_per_page, $offset);
|
||||
$parameters['time_zone'] = $time_zone;
|
||||
$database = new database;
|
||||
$email_queue = $database->select($sql, $parameters, 'all');
|
||||
unset($sql, $parameters);
|
||||
|
||||
|
||||
@@ -52,7 +52,6 @@
|
||||
|
||||
//delete the data
|
||||
$array['email_queue'][]['email_queue_uuid'] = $id;
|
||||
$database = new database;
|
||||
$database->delete($array);
|
||||
unset($array);
|
||||
|
||||
|
||||
@@ -84,20 +84,17 @@
|
||||
switch ($_POST['action']) {
|
||||
case 'copy':
|
||||
if (permission_exists('email_queue_add')) {
|
||||
$obj = new database;
|
||||
$obj->copy($array);
|
||||
$database->copy($array);
|
||||
}
|
||||
break;
|
||||
case 'delete':
|
||||
if (permission_exists('email_queue_delete')) {
|
||||
$obj = new database;
|
||||
$obj->delete($array);
|
||||
$database->delete($array);
|
||||
}
|
||||
break;
|
||||
case 'toggle':
|
||||
if (permission_exists('email_queue_update')) {
|
||||
$obj = new database;
|
||||
$obj->toggle($array);
|
||||
$database->toggle($array);
|
||||
}
|
||||
break;
|
||||
}
|
||||
@@ -190,9 +187,6 @@
|
||||
$array['email_queue'][0]['email_response'] = $email_response;
|
||||
|
||||
//save the data
|
||||
$database = new database;
|
||||
$database->app_name = 'email queue';
|
||||
$database->app_uuid = '5befdf60-a242-445f-91b3-2e9ee3e0ddf7';
|
||||
$database->save($array);
|
||||
|
||||
//redirect the user
|
||||
@@ -216,7 +210,6 @@
|
||||
//$sql .= "and domain_uuid = :domain_uuid ";
|
||||
//$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
|
||||
$parameters['email_queue_uuid'] = $email_queue_uuid;
|
||||
$database = new database;
|
||||
$row = $database->select($sql, $parameters, 'row');
|
||||
if (is_array($row) && @sizeof($row) != 0) {
|
||||
$email_date = $row["email_date"];
|
||||
|
||||
@@ -60,7 +60,6 @@
|
||||
$sql .= "limit 1 ";
|
||||
$parameters['template_language'] = $language_dialect;
|
||||
$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
|
||||
$database = new database;
|
||||
$template = $database->select($sql, $parameters, 'row');
|
||||
unset($sql, $parameters);
|
||||
}
|
||||
|
||||
@@ -148,7 +148,6 @@
|
||||
$sql = "select domain_uuid from v_domains ";
|
||||
$sql .= "where domain_name = :domain_name ";
|
||||
$parameters['domain_name'] = $domain_name;
|
||||
$database = new database;
|
||||
$domain_uuid = $database->select($sql, $parameters, 'column');
|
||||
unset($parameters);
|
||||
|
||||
@@ -208,7 +207,6 @@
|
||||
$parameters['template_category'] = $template_category;
|
||||
$parameters['template_subcategory'] = $template_subcategory;
|
||||
$parameters['template_type'] = $template_type;
|
||||
$database = new database;
|
||||
$row = $database->select($sql, $parameters, 'row');
|
||||
if (is_array($row)) {
|
||||
$email_subject = $row['template_subject'];
|
||||
|
||||
@@ -128,7 +128,6 @@
|
||||
$parameters['hostname'] = gethostname();
|
||||
}
|
||||
$parameters['limit'] = $email_queue_limit;
|
||||
$database = new database;
|
||||
$email_queue = $database->select($sql, $parameters, 'all');
|
||||
unset($parameters);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user