Remove redundant database instances (#7535)

This commit is contained in:
FusionPBX
2025-10-01 08:56:06 -06:00
committed by GitHub
parent 6fcd0e83c1
commit d1baf05891
204 changed files with 43 additions and 754 deletions

View File

@@ -114,7 +114,6 @@
$sql .= "or lower(fax_description) like :search ";
$parameters['search'] = '%'.strtolower($search).'%';
}
$database = new database;
$num_rows = $database->select($sql, $parameters ?? null, 'column');
//prepare paging
@@ -164,7 +163,6 @@
}
$sql .= order_by($order_by, $order, 'fax_name', 'asc', $sort);
$sql .= limit_offset($rows_per_page, $offset);
$database = new database;
$result = $database->select($sql, $parameters ?? null, 'all');
unset($sql, $parameters);

View File

@@ -139,10 +139,7 @@
$p->add('fax_add', 'temp');
$p->add('fax_edit', 'temp');
$database = new database;
$database->app_name = 'fax';
$database->app_uuid = '24108154-4ac3-1db6-1551-4731703a4440';
$message = $database->save($array);
$database->save($array);
unset($array);
//revoke temp permissions
@@ -170,7 +167,6 @@
$sql .= "and fax_uuid = :fax_uuid ";
$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
$parameters['fax_uuid'] = $fax_uuid;
$database = new database;
$row = $database->select($sql, $parameters, 'row');
if (is_array($row) && @sizeof($row) != 0) {
$fax_email_connection_type = $row["fax_email_connection_type"];

View File

@@ -53,7 +53,6 @@
$sql .= "and fax_uuid = :fax_uuid ";
$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
$parameters['fax_uuid'] = $fax_uuid;
$database = new database;
$row = $database->select($sql, $parameters, 'row');
if (is_array($row) && @sizeof($row) != 0) {
$fax_extension = $row["fax_extension"];
@@ -110,9 +109,6 @@
$p = permissions::new();
$p->add('fax_add', 'temp');
$database = new database;
$database->app_name = 'fax';
$database->app_uuid = '24108154-4ac3-1db6-1551-4731703a4440';
$database->save($array);
unset($array);

View File

@@ -178,9 +178,6 @@
$p = permissions::new();
$p->add('fax_user_delete', 'temp');
$database = new database;
$database->app_name = 'fax';
$database->app_uuid = '24108154-4ac3-1db6-1551-4731703a4440';
$database->delete($array);
unset($array);
@@ -206,9 +203,6 @@
$p = permissions::new();
$p->add('fax_user_add', 'temp');
$database = new database;
$database->app_name = 'fax';
$database->app_uuid = '24108154-4ac3-1db6-1551-4731703a4440';
$database->save($array);
unset($array);
@@ -365,9 +359,6 @@
$array['fax'][0]['fax_description'] = $fax_description;
//execute
$database = new database;
$database->app_name = 'fax';
$database->app_uuid = '24108154-4ac3-1db6-1551-4731703a4440';
$database->save($array);
unset($array);
@@ -388,7 +379,6 @@
$sql .= "and fax_uuid = :fax_uuid ";
$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
$parameters['fax_uuid'] = $fax_uuid;
$database = new database;
$dialplan_uuid = $database->select($sql, $parameters, 'column');
unset($sql, $parameters);
@@ -425,7 +415,6 @@
$sql .= "and fax_uuid = :fax_uuid ";
$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
$parameters['fax_uuid'] = $fax_uuid;
$database = new database;
$row = $database->select($sql, $parameters, 'row');
if (is_array($row) && @sizeof($row) != 0) {
$dialplan_uuid = $row["dialplan_uuid"];
@@ -458,7 +447,6 @@
$sql .= "and e.fax_uuid = :fax_uuid ";
$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
$parameters['fax_uuid'] = $fax_uuid;
$database = new database;
$fax_users = $database->select($sql, $parameters, 'all');
unset($sql, $parameters);
}
@@ -475,7 +463,6 @@
$sql .= ")\n";
$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
$parameters['fax_uuid'] = $fax_uuid;
$database = new database;
$available_users = $database->select($sql, $parameters, 'all');
unset($sql, $parameters);
}

View File

@@ -38,9 +38,6 @@
exit;
}
//create the database object
$database = new database;
//add multi-lingual support
$language = new text;
$text = $language->get();

View File

@@ -69,7 +69,6 @@
$parameters['fax_uuid'] = $fax_uuid;
$parameters['user_uuid'] = $_SESSION['user_uuid'];
}
$database = new database;
$row = $database->select($sql, $parameters, 'row');
if (is_array($row) && @sizeof($row) != 0) {
$fax_name = $row["fax_name"];

View File

@@ -75,7 +75,6 @@
$sql .= "and fax_log_uuid = :fax_log_uuid ";
$parameters['domain_uuid'] = $domain_uuid;
$parameters['fax_log_uuid'] = $fax_log_uuid;
$database = new database;
$row = $database->select($sql, $parameters, 'row');
if (is_array($row) && @sizeof($row) != 0) {
$fax_log_uuid = $row["fax_log_uuid"];

View File

@@ -91,7 +91,6 @@
$sql .= $sql_search ?? '';
$parameters['domain_uuid'] = $domain_uuid;
$parameters['fax_uuid'] = $fax_uuid;
$database = new database;
$num_rows = $database->select($sql, $parameters, 'column');
//prepare to page the results
@@ -108,7 +107,6 @@
$sql = str_replace('count(fax_log_uuid)', '*', $sql);
$sql .= order_by($order_by, $order, 'fax_epoch', 'desc');
$sql .= limit_offset($rows_per_page, $offset ?? 0);
$database = new database;
$fax_logs = $database->select($sql, $parameters, 'all');
unset($sql, $parameters);

View File

@@ -68,7 +68,6 @@
$parameters['fax_uuid'] = $fax_uuid;
$parameters['user_uuid'] = $_SESSION['user_uuid'];
}
$database = new database;
$row = $database->select($sql, $parameters, 'row');
if (is_array($row) && @sizeof($row) != 0) {
//set database fields as variables
@@ -90,7 +89,6 @@
$sql .= "and fax_mode = 'tx' ";
$parameters['fax_uuid'] = $_REQUEST["id"];
$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
$database = new database;
$fax_files = $database->select($sql, $parameters, 'all');
unset($sql, $parameters);