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

Use the settings array to pass database connection 

Improve efficiency by using one database connection
This commit is contained in:
FusionPBX 2025-01-18 15:47:56 -07:00 committed by GitHub
parent b6386ada32
commit 8b59ef881b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
app/destinations/resources/classes/destinations.php
View File

@ -52,22 +52,33 @@ if (!class_exists('destinations')) {
private $list_page; private $list_page;
private $table; private $table;
private $uuid_prefix; private $uuid_prefix;
private $database;
private $settings; private $settings;
/** /**
* Called when the object is created * Called when the object is created
*/ */
public function __construct($settings = null) { public function __construct($setting_array = []) {
//open a database connection
if (empty($setting_array['database'])) {
$this->database = database::new();
} else {
$this->database = $setting_array['database'];
}
//get the settings object
if (empty($setting_array['settings'])) {
$this->settings = new settings();
} else {
$this->settings = $setting_array['settings'];
}
//set the domain details //set the domain details
if (is_null($this->domain_uuid)) { if (is_null($this->domain_uuid)) {
$this->domain_uuid = $_SESSION['domain_uuid']; $this->domain_uuid = $_SESSION['domain_uuid'];
} }
//get the email queue settings
if (!isset($settings)) {
$this->settings = new settings();
}
//assign private variables //assign private variables
$this->app_name = 'destinations'; $this->app_name = 'destinations';
$this->app_uuid = '5ec89622-b19c-3559-64f0-afde802ab139'; $this->app_uuid = '5ec89622-b19c-3559-64f0-afde802ab139';
@ -180,8 +191,7 @@ if (!class_exists('destinations')) {
$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'] = $this->domain_uuid; $parameters['domain_uuid'] = $this->domain_uuid;
$database = new database; $this->domain_name = $this->database->select($sql, $parameters, 'column');
$this->domain_name = $database->select($sql, $parameters, 'column');
//initialize variable //initialize variable
$response = ''; $response = '';
@ -252,8 +262,7 @@ if (!class_exists('destinations')) {
} }
$sql .= "order by ".trim($row['order_by']); $sql .= "order by ".trim($row['order_by']);
$sql = str_replace("\${domain_uuid}", $this->domain_uuid, $sql); $sql = str_replace("\${domain_uuid}", $this->domain_uuid, $sql);
$database = new database; $result = $this->database->select($sql, null, 'all');
$result = $database->select($sql, null, 'all');
$this->destinations[$x]['result']['sql'] = $sql; $this->destinations[$x]['result']['sql'] = $sql;
$this->destinations[$x]['result']['data'] = $result; $this->destinations[$x]['result']['data'] = $result;
@ -550,9 +559,6 @@ if (!class_exists('destinations')) {
//set the global variables //set the global variables
global $db_type; global $db_type;
//connect to the database
$database = new database;
//set default values //set default values
$destination_name = ''; $destination_name = '';
$destination_id = ''; $destination_id = '';
@ -561,7 +567,7 @@ if (!class_exists('destinations')) {
$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'] = $this->domain_uuid; $parameters['domain_uuid'] = $this->domain_uuid;
$this->domain_name = $database->select($sql, $parameters, 'column'); $this->domain_name = $this->database->select($sql, $parameters, 'column');
//get the destinations //get the destinations
if (!is_array($this->destinations)) { if (!is_array($this->destinations)) {
@ -625,7 +631,7 @@ if (!class_exists('destinations')) {
} }
$sql .= "order by ".trim($row['order_by']); $sql .= "order by ".trim($row['order_by']);
$sql = str_replace("\${domain_uuid}", $this->domain_uuid, $sql); $sql = str_replace("\${domain_uuid}", $this->domain_uuid, $sql);
$result = $database->select($sql, null, 'all'); $result = $this->database->select($sql, null, 'all');
$this->destinations[$x]['result']['sql'] = $sql; $this->destinations[$x]['result']['sql'] = $sql;
$this->destinations[$x]['result']['data'] = $result; $this->destinations[$x]['result']['data'] = $result;
@ -764,14 +770,11 @@ if (!class_exists('destinations')) {
//set the global variables //set the global variables
global $db_type; global $db_type;
//connect to the database
$database = new database;
//get the domain_name //get the domain_name
$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'] = $this->domain_uuid; $parameters['domain_uuid'] = $this->domain_uuid;
$this->domain_name = $database->select($sql, $parameters, 'column'); $this->domain_name = $this->database->select($sql, $parameters, 'column');
//get the destinations //get the destinations
if (!is_array($this->destinations)) { if (!is_array($this->destinations)) {
@ -836,7 +839,7 @@ if (!class_exists('destinations')) {
} }
$sql .= "order by ".trim($row['order_by']); $sql .= "order by ".trim($row['order_by']);
$sql = str_replace("\${domain_uuid}", $this->domain_uuid, $sql); $sql = str_replace("\${domain_uuid}", $this->domain_uuid, $sql);
$result = $database->select($sql, null, 'all'); $result = $this->database->select($sql, null, 'all');
$this->destinations[$x]['result']['sql'] = $sql; $this->destinations[$x]['result']['sql'] = $sql;
$this->destinations[$x]['result']['data'] = $result; $this->destinations[$x]['result']['data'] = $result;
@ -1063,8 +1066,7 @@ if (!class_exists('destinations')) {
$sql = "select dialplan_uuid, destination_context from v_destinations "; $sql = "select dialplan_uuid, destination_context from v_destinations ";
$sql .= "where destination_uuid = :destination_uuid "; $sql .= "where destination_uuid = :destination_uuid ";
$parameters['destination_uuid'] = $record['uuid']; $parameters['destination_uuid'] = $record['uuid'];
$database = new database; $row = $this->database->select($sql, $parameters, 'row');
$row = $database->select($sql, $parameters, 'row');
unset($sql, $parameters); unset($sql, $parameters);
//include dialplan in array //include dialplan in array
@ -1086,10 +1088,9 @@ if (!class_exists('destinations')) {
$p->add('dialplan_detail_delete', 'temp'); $p->add('dialplan_detail_delete', 'temp');
//execute delete //execute delete
$database = new database; $this->database->app_name = $this->app_name;
$database->app_name = $this->app_name; $this->database->app_uuid = $this->app_uuid;
$database->app_uuid = $this->app_uuid; $this->database->delete($array);
$database->delete($array);
unset($array); unset($array);
//revoke temporary permissions //revoke temporary permissions
@ -1255,8 +1256,7 @@ if (!class_exists('destinations')) {
if (!(!empty($_GET['show']) && $_GET['show'] === 'all' && permission_exists('destination_summary_all'))) { if (!(!empty($_GET['show']) && $_GET['show'] === 'all' && permission_exists('destination_summary_all'))) {
$parameters['domain_uuid'] = $this->domain_uuid; $parameters['domain_uuid'] = $this->domain_uuid;
} }
$database = new database; $summary = $this->database->select($sql, $parameters, 'all');
$summary = $database->select($sql, $parameters, 'all');
unset($parameters); unset($parameters);
//if (!empty($this->start_stamp_begin) && !empty($this->start_stamp_end)) { //if (!empty($this->start_stamp_begin) && !empty($this->start_stamp_end)) {