nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2025-12-30 00:53:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Define app_name and app_uuid as constants (#7534)

Browse Source 
* Set a constant on each class for app_name and app_uuid
* Update the database class to use the app_uuid and app_name
* Update the classes to use the database::new()
* Remove the instances of 'new database'
This commit is contained in:
FusionPBX
2025-09-30 21:37:09 -06:00
committed by GitHub
parent 6485b18822
commit 2fe8b65988
69 changed files with 2571 additions and 2809 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
app/gateways/resources/classes/gateways.php
View File

@@ -27,11 +27,16 @@
//define the gateways class
class gateways {
/**
* declare constant variables
*/
const app_name = 'gateways';
const app_uuid = '297ab33e-2c2f-8196-552c-f3567d2caaf8';
/**
* declare private variables
*/
private $app_name;
private $app_uuid;
private $database;
private $permission_prefix;
private $list_page;
private $table;
@@ -45,14 +50,17 @@
public function __construct() {
//assign private variables
$this->app_name = 'gateways';
$this->app_uuid = '297ab33e-2c2f-8196-552c-f3567d2caaf8';
$this->permission_prefix = 'gateway_';
$this->list_page = 'gateways.php';
$this->table = 'gateways';
$this->uuid_prefix = 'gateway_';
$this->toggle_field = 'enabled';
$this->toggle_values = ['true','false'];
$this->permission_prefix = 'gateway_';
$this->list_page = 'gateways.php';
$this->table = 'gateways';
$this->uuid_prefix = 'gateway_';
$this->toggle_field = 'enabled';
$this->toggle_values = ['true','false'];
//connect to the database
if (empty($this->database)) {
$this->database = database::new();
}
}
@@ -95,8 +103,7 @@
$sql .= "and ".$this->uuid_prefix."uuid in (".implode(', ', $uuids).") ";
$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
}
$database = new database;
$rows = $database->select($sql, $parameters ?? null, 'all');
$rows = $this->database->select($sql, $parameters ?? null, 'all');
if (!empty($rows) && is_array($rows) && @sizeof($rows) != 0) {
foreach ($rows as $row) {
$gateways[$row['uuid']]['name'] = $row['gateway'];
@@ -183,8 +190,7 @@
$sql .= "and ".$this->uuid_prefix."uuid in (".implode(', ', $uuids).") ";
$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
}
$database = new database;
$rows = $database->select($sql, $parameters ?? null, 'all');
$rows = $this->database->select($sql, $parameters ?? null, 'all');
if (is_array($rows) && @sizeof($rows) != 0) {
foreach ($rows as $row) {
$gateways[$row['uuid']]['name'] = $row['gateway'];
@@ -261,8 +267,7 @@
$sql .= "and ".$this->uuid_prefix."uuid in (".implode(', ', $uuids).") ";
$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
}
$database = new database;
$rows = $database->select($sql, $parameters ?? null, 'all');
$rows = $this->database->select($sql, $parameters ?? null, 'all');
if (!empty($rows) && is_array($rows) && @sizeof($rows) != 0) {
foreach ($rows as $row) {
$gateways[$row['uuid']]['name'] = $row['gateway'];
@@ -307,10 +312,7 @@
if (!empty($array) && is_array($array) && @sizeof($array) != 0) {
//execute delete
$database = new database;
$database->app_name = $this->app_name;
$database->app_uuid = $this->app_uuid;
$database->delete($array);
$this->database->delete($array);
unset($array);
//synchronize the xml config
@@ -388,8 +390,7 @@
$sql .= "and ".$this->uuid_prefix."uuid in (".implode(', ', $uuids).") ";
$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
}
$database = new database;
$rows = $database->select($sql, $parameters ?? null, 'all');
$rows = $this->database->select($sql, $parameters ?? null, 'all');
if (!empty($rows) && is_array($rows) && @sizeof($rows) != 0) {
foreach ($rows as $row) {
$gateways[$row['uuid']]['state'] = $row['state'];
@@ -412,10 +413,8 @@
if (!empty($array) && is_array($array) && @sizeof($array) != 0) {
//save the array
$database = new database;
$database->app_name = $this->app_name;
$database->app_uuid = $this->app_uuid;
$database->save($array);
$this->database->save($array);
unset($array);
//update gateway session variables or remove xml files (if necessary)
@@ -514,8 +513,7 @@
$sql .= "and ".$this->uuid_prefix."uuid in (".implode(', ', $uuids).") ";
$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
}
$database = new database;
$rows = $database->select($sql, $parameters ?? null, 'all');
$rows = $this->database->select($sql, $parameters ?? null, 'all');
if (!empty($rows) && is_array($rows) && @sizeof($rows) != 0) {
foreach ($rows as $x => $row) {
$primary_uuid = uuid();
@@ -549,10 +547,8 @@
if (!empty($array) && is_array($array) && @sizeof($array) != 0) {
//save the array
$database = new database;
$database->app_name = $this->app_name;
$database->app_uuid = $this->app_uuid;
$database->save($array);
$this->database->save($array);
unset($array);
//add new gateways to session variables