From 64a95a972e0a5a2d983096b8267660bf0bf08e36 Mon Sep 17 00:00:00 2001
From: FusionPBX <markjcrane@gmail.com>
Date: Mon, 23 Sep 2024 19:19:19 -0600
Subject: [PATCH] More efficient use of the database object

---
 app/voicemails/app_defaults.php | 5 -----
 themes/default/app_defaults.php | 4 ----
 2 files changed, 9 deletions(-)

diff --git a/app/voicemails/app_defaults.php b/app/voicemails/app_defaults.php
index 9e29cbe31f..0897b7cb4f 100644
--- a/app/voicemails/app_defaults.php
+++ b/app/voicemails/app_defaults.php
@@ -32,7 +32,6 @@ if ($domains_processed == 1) {
 	$sql .= "from v_voicemails as v, v_domains as d \n";
 	$sql .= "where voicemail_enabled = 'true' \n";
 	$sql .= "and v.domain_uuid = d.domain_uuid \n";
-	$database = new database;
 	$voicemails = $database->select($sql, null, 'all');
 	unset($sql, $parameters);
 	if (!empty($voicemails) && is_array($voicemails)) {
@@ -67,7 +66,6 @@ if ($domains_processed == 1) {
 			$sql .= "where default_setting_category = 'switch' ";
 			$sql .= "and default_setting_subcategory = 'languages' ";
 			$sql .= "and default_setting_name = 'dir' ";
-			$database = new database;
 			$database->execute($sql);
 			unset($sql);
 		}
@@ -111,19 +109,16 @@ if ($domains_processed == 1) {
 	$sql .= "where default_setting_category = 'switch' ";
 	$sql .= "and default_setting_subcategory = 'phrases' ";
 	$sql .= "and default_setting_name = 'dir' ";
-	$database = new database;
 	$database->execute($sql);
 	unset($sql);
 
 	//set default value of voicemail_recording_instructions to true
 	$sql = "update v_voicemails set voicemail_recording_instructions = 'true' where voicemail_recording_instructions is null";
-	$database = new database;
 	$database->execute($sql);
 	unset($sql);
 
 	//set default value of voicemail_recording_options to true
 	$sql = "update v_voicemails set voicemail_recording_options = 'true' where voicemail_recording_options is null";
-	$database = new database;
 	$database->execute($sql);
 	unset($sql);
 
diff --git a/themes/default/app_defaults.php b/themes/default/app_defaults.php
index ca8a6faa57..bf0c0110a8 100644
--- a/themes/default/app_defaults.php
+++ b/themes/default/app_defaults.php
@@ -60,7 +60,6 @@
 			$sql .= "set default_setting_value = '#fafafa' ";
 			$sql .= "where default_setting_subcategory = 'message_default_color' ";
 			$sql .= "and default_setting_value = '#ccffcc' ";
-			$database = new database;
 			$database->execute($sql);
 			unset($sql);
 
@@ -68,7 +67,6 @@
 			$sql .= "set default_setting_value = '#666' ";
 			$sql .= "where default_setting_subcategory = 'message_default_background_color' ";
 			$sql .= "and default_setting_value = '#004200' ";
-			$database = new database;
 			$database->execute($sql);
 			unset($sql);
 
@@ -77,7 +75,6 @@
 			$sql .= "where default_setting_subcategory = 'menu_main_icons' ";
 			$sql .= "and default_setting_value = 'false' ";
 			$sql .= "and default_setting_enabled = 'false' ";
-			$database = new database;
 			$database->execute($sql);
 			unset($sql);
 
@@ -113,7 +110,6 @@
 
 		//execute array of queries
 			foreach ($queries as $sql) {
-				$database = new database;
 				$database->execute($sql);
 			}
 			unset($queries, $sql);