Define app_name and app_uuid as constants (#7534)

* 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
+8 -10
View File
@@ -31,11 +31,15 @@
*/
class domains {
/**
* declare constant variables
*/
const app_name = 'domains';
const app_uuid = '8b91605b-f6d2-42e6-a56d-5d1ded01bb44';
/**
* declare the variables
*/
private $app_name;
private $app_uuid;
private $name;
private $table;
private $toggle_field;
@@ -53,8 +57,6 @@
*/
public function __construct($setting_array = []) {
//assign the variables
$this->app_name = 'domains';
$this->app_uuid = '8b91605b-f6d2-42e6-a56d-5d1ded01bb44';
$this->name = 'domain';
$this->table = 'domains';
$this->toggle_field = 'domain_enabled';
@@ -271,8 +273,6 @@
//delete the checked rows
if (is_array($domain_array) && @sizeof($domain_array) != 0) {
//execute delete
$this->database->app_name = $this->app_name;
$this->database->app_uuid = $this->app_uuid;
$this->database->delete($domain_array);
//set message
@@ -338,8 +338,7 @@
//save the changes
if (is_array($array) && @sizeof($array) != 0) {
//save the array
$this->database->app_name = $this->app_name;
$this->database->app_uuid = $this->app_uuid;
$this->database->save($array);
unset($array);
@@ -404,8 +403,7 @@
//save the changes and set the message
if (is_array($array) && @sizeof($array) != 0) {
//save the array
$this->database->app_name = $this->app_name;
$this->database->app_uuid = $this->app_uuid;
$this->database->save($array);
unset($array);