Remove redundant database instances (#7535)

core/contacts/contact_address_edit.php

@@ -134,9 +134,6 @@
 					$p = permissions::new();
 					$p->add('contact_edit', 'temp');
 
-					$database = new database;
-					$database->app_name = 'contacts';
-					$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
 					$database->save($array);
 					unset($array);
 
@@ -149,7 +146,6 @@
 						$sql .= "and contact_uuid = :contact_uuid ";
 						$parameters['domain_uuid'] = $domain_uuid;
 						$parameters['contact_uuid'] = $contact_uuid;
-						$database = new database;
 						$database->execute($sql, $parameters);
 						unset($sql, $parameters);
 					}
@@ -184,9 +180,6 @@
 					$array['contact_addresses'][0]['address_primary'] = $address_primary;
 					$array['contact_addresses'][0]['address_description'] = $address_description;
 
-					$database = new database;
-					$database->app_name = 'contacts';
-					$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
 					$database->save($array);
 					unset($array);
 				}
@@ -205,7 +198,6 @@
 		$sql .= "and contact_address_uuid = :contact_address_uuid ";
 		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 		$parameters['contact_address_uuid'] = $contact_address_uuid;
-		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');
 		if (!empty($row)) {
 			$address_type = $row["address_type"];

core/contacts/contact_addresses.php

@@ -52,7 +52,6 @@
 	$sql .= "order by address_primary desc, address_label asc ";
 	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 	$parameters['contact_uuid'] = $contact_uuid ?? '';
-	$database = new database;
 	$contact_addresses = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 

core/contacts/contact_addresses_view.php

@@ -44,7 +44,6 @@
 	$sql .= "order by address_primary desc, address_label asc ";
 	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 	$parameters['contact_uuid'] = $contact_uuid ?? '';
-	$database = new database;
 	$contact_addresses = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 

core/contacts/contact_attachment.php

@@ -45,7 +45,6 @@
 		$sql .= "and (domain_uuid = :domain_uuid or domain_uuid is null) ";
 		$parameters['contact_attachment_uuid'] = $contact_attachment_uuid;
 		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
-		$database = new database;
 		$attachment = $database->select($sql, $parameters ?? null, 'row');
 		unset($sql, $parameters);
 

core/contacts/contact_attachment_edit.php

@@ -84,7 +84,6 @@
 			$sql .= "and contact_uuid = :contact_uuid ";
 			$parameters['domain_uuid'] = $domain_uuid;
 			$parameters['contact_uuid'] = $contact_uuid;
-			$database = new database;
 			$database->execute($sql, $parameters ?? null);
 			unset($sql, $parameters);
 
@@ -157,9 +156,6 @@
 		}
 
 		//save data
-		$database = new database;
-		$database->app_name = 'contacts';
-		$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
 		$database->save($array);
 		unset($array);
 
@@ -176,7 +172,6 @@
 		$sql .= "and contact_attachment_uuid = :contact_attachment_uuid ";
 		$parameters['domain_uuid'] = $domain_uuid;
 		$parameters['contact_attachment_uuid'] = $contact_attachment_uuid;
-		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');
 		if (!empty($row)) {
 			$attachment_primary = $row["attachment_primary"];

core/contacts/contact_attachments.php

@@ -47,7 +47,6 @@
 	$sql .= "order by attachment_primary desc, attachment_filename asc ";
 	$parameters['domain_uuid'] = $domain_uuid;
 	$parameters['contact_uuid'] = $contact_uuid ?? '';
-	$database = new database;
 	$contact_attachments = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 

core/contacts/contact_attachments_view.php

@@ -44,7 +44,6 @@
 	$sql .= "order by attachment_primary desc, attachment_filename asc ";
 	$parameters['domain_uuid'] = $domain_uuid;
 	$parameters['contact_uuid'] = $contact_uuid ?? '';
-	$database = new database;
 	$contact_attachments = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 

core/contacts/contact_edit.php

@@ -34,9 +34,6 @@
 		exit;
 	}
 
-//connect to the database
-	$database = new database;
-
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
@@ -382,7 +379,6 @@
 								}
 								$parameters['phone_speed_dial'] = $row["phone_speed_dial"];
 								$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
-								$database = new database;
 								if (!empty($database->execute($sql, $parameters, 'column'))) {
 									$phone_speed_dial_exists = true;
 								}

core/contacts/contact_email_edit.php

@@ -115,9 +115,6 @@ if (!empty($_GET["contact_uuid"]) && is_uuid($_GET["contact_uuid"])) {
 					$p = permissions::new();
 					$p->add('contact_edit', 'temp');
 
-					$database = new database;
-					$database->app_name = 'contacts';
-					$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
 					$database->save($array);
 					unset($array);
 
@@ -130,7 +127,6 @@ if (!empty($_GET["contact_uuid"]) && is_uuid($_GET["contact_uuid"])) {
 						$sql .= "and contact_uuid = :contact_uuid ";
 						$parameters['domain_uuid'] = $domain_uuid;
 						$parameters['contact_uuid'] = $contact_uuid;
-						$database = new database;
 						$database->execute($sql, $parameters);
 						unset($sql, $parameters);
 					}
@@ -156,9 +152,6 @@ if (!empty($_GET["contact_uuid"]) && is_uuid($_GET["contact_uuid"])) {
 					$array['contact_emails'][0]['email_primary'] = $email_primary ? 1 : 0;
 					$array['contact_emails'][0]['email_description'] = $email_description;
 
-					$database = new database;
-					$database->app_name = 'contacts';
-					$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
 					$database->save($array);
 					unset($array);
 				}
@@ -177,7 +170,6 @@ if (!empty($_GET["contact_uuid"]) && is_uuid($_GET["contact_uuid"])) {
 		$sql .= "and contact_email_uuid = :contact_email_uuid ";
 		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 		$parameters['contact_email_uuid'] = $contact_email_uuid;
-		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');;
 		if (!empty($row)) {
 			$email_label = $row["email_label"];

core/contacts/contact_emails.php

@@ -47,7 +47,6 @@
 	$sql .= "order by email_primary desc, email_label asc ";
 	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 	$parameters['contact_uuid'] = $contact_uuid ?? '';
-	$database = new database;
 	$contact_emails = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 

core/contacts/contact_emails_view.php

@@ -44,7 +44,6 @@
 	$sql .= "order by email_primary desc, email_label asc ";
 	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 	$parameters['contact_uuid'] = $contact_uuid ?? '';
-	$database = new database;
 	$contact_emails = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 

core/contacts/contact_extensions.php

@@ -50,7 +50,6 @@
 	$sql .= "order by e.extension asc ";
 	$parameters['domain_uuid'] = $domain_uuid;
 	$parameters['contact_uuid'] = $contact_uuid ?? '';
-	$database = new database;
 	$contact_extensions = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 

core/contacts/contact_extensions_view.php

@@ -47,7 +47,6 @@
 	$sql .= "order by e.extension asc ";
 	$parameters['domain_uuid'] = $domain_uuid;
 	$parameters['contact_uuid'] = $contact_uuid ?? '';
-	$database = new database;
 	$contact_extensions = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 

core/contacts/contact_import.php

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

core/contacts/contact_import_google.php

@@ -83,7 +83,6 @@ if ($_POST['a'] == 'import') {
 			$sql .= "and contact_setting_enabled = true ";
 			$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 			$parameters['contact_setting_value'] = $contact_id;
-			$database = new database;
 			$result = $database->select($sql, $parameters, 'row');
 			if (is_uuid($result['contact_uuid'])) {
 				$duplicate_exists = true;
@@ -241,9 +240,6 @@ if ($_POST['a'] == 'import') {
 			unset($contact_setting_columns, $contact_setting_array);
 
 			//insert records
-			$database = new database;
-			$database->app_name = 'contacts';
-			$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
 			$database->save($array);
 			unset($array);
 

core/contacts/contact_json.php

@@ -147,7 +147,6 @@
 	}
 	$sql .= "order by contact_organization asc ";
 	$sql .= "limit 300 ";
-	$database = new database;
 	$contact_array = $database->select($sql, $parameters ?? null, 'all');
 	unset($sql, $parameters);
 

core/contacts/contact_note_edit.php

@@ -105,9 +105,6 @@
 					$p = permissions::new();
 					$p->add('contact_edit', 'temp');
 
-					$database = new database;
-					$database->app_name = 'contacts';
-					$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
 					$database->save($array);
 					unset($array);
 
@@ -136,9 +133,6 @@
 						$array['contact_notes'][0]['last_mod_date'] = 'now()';
 						$array['contact_notes'][0]['last_mod_user'] = $_SESSION['username'];
 
-						$database = new database;
-						$database->app_name = 'contacts';
-						$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
 						$database->save($array);
 						unset($array);
 					}
@@ -158,7 +152,6 @@
 		$sql .= "and contact_note_uuid = :contact_note_uuid ";
 		$parameters['domain_uuid'] = $domain_uuid;
 		$parameters['contact_note_uuid'] = $contact_note_uuid;
-		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');
 		if (!empty($row)) {
 			$contact_note = $row["contact_note"];

core/contacts/contact_notes.php

@@ -49,7 +49,6 @@
 	$sql .= "order by last_mod_date desc ";
 	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 	$parameters['contact_uuid'] = $contact_uuid ?? '';
-	$database = new database;
 	$contact_notes = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 

core/contacts/contact_notes_view.php

@@ -44,7 +44,6 @@
 	$sql .= "order by last_mod_date desc ";
 	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 	$parameters['contact_uuid'] = $contact_uuid ?? '';
-	$database = new database;
 	$contact_notes = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 

core/contacts/contact_phone_edit.php

@@ -135,9 +135,6 @@
 					$p = permissions::new();
 					$p->add('contact_edit', 'temp');
 
-					$database = new database;
-					$database->app_name = 'contacts';
-					$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
 					$database->save($array);
 					unset($array);
 
@@ -150,7 +147,6 @@
 						$sql .= "and contact_uuid = :contact_uuid ";
 						$parameters['domain_uuid'] = $domain_uuid;
 						$parameters['contact_uuid'] = $contact_uuid;
-						$database = new database;
 						$database->execute($sql, $parameters);
 						unset($sql, $parameters);
 					}
@@ -169,7 +165,6 @@
 							}
 							$parameters['phone_speed_dial'] = $phone_speed_dial;
 							$parameters['domain_uuid'] = $domain_uuid;
-							$database = new database;
 							if (!empty($database->execute($sql, $parameters, 'column'))) {
 								$phone_speed_dial_exists = true;
 							}
@@ -212,9 +207,6 @@
 						$array['contact_phones'][0]['phone_primary'] = $phone_primary ? 1 : 0;
 						$array['contact_phones'][0]['phone_description'] = $phone_description;
 
-						$database = new database;
-						$database->app_name = 'contacts';
-						$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
 						$database->save($array);
 						unset($array);
 					}
@@ -234,7 +226,6 @@
 		$sql .= "and contact_phone_uuid = :contact_phone_uuid ";
 		$parameters['domain_uuid'] = $domain_uuid;
 		$parameters['contact_phone_uuid'] = $contact_phone_uuid;
-		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');
 		if (!empty($row)) {
 			$phone_label = $row["phone_label"];

core/contacts/contact_phones.php

@@ -44,7 +44,6 @@
 	$sql .= "order by phone_primary desc, phone_label asc ";
 	$parameters['domain_uuid'] = $domain_uuid;
 	$parameters['contact_uuid'] = $contact_uuid ?? '';
-	$database = new database;
 	$contact_phones = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 

core/contacts/contact_phones_view.php

@@ -44,7 +44,6 @@
 	$sql .= "order by phone_primary desc, phone_label asc ";
 	$parameters['domain_uuid'] = $domain_uuid;
 	$parameters['contact_uuid'] = $contact_uuid ?? '';
-	$database = new database;
 	$contact_phones = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 
@@ -67,7 +66,6 @@
 			$sql .= "and (dialplan_detail_enabled = true or dialplan_detail_enabled is null) ";
 			$sql .= "limit 1";
 			$parameters['domain_uuid'] = $domain_uuid;
-			$database = new database;
 			$speed_dial_condition = $database->select($sql, $parameters, 'column');
 			if (!empty($speed_dial_condition)) {
 				$speed_dial_prefix = str_replace('(.*)', '', trim($speed_dial_condition,'^\$')); // default: ^\*0(.*)$

core/contacts/contact_relation_edit.php

@@ -113,9 +113,6 @@
 					$p = permissions::new();
 					$p->add('contact_edit', 'temp');
 
-					$database = new database;
-					$database->app_name = 'contacts';
-					$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
 					$database->save($array);
 					unset($array);
 
@@ -152,9 +149,6 @@
 						$array['contact_relations'][0]['relation_label'] = $relation_label;
 						$array['contact_relations'][0]['relation_contact_uuid'] = $relation_contact_uuid;
 
-						$database = new database;
-						$database->app_name = 'contacts';
-						$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
 						$database->save($array);
 						unset($array);
 					}
@@ -174,7 +168,6 @@
 		$sql .= "and contact_relation_uuid = :contact_relation_uuid ";
 		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 		$parameters['contact_relation_uuid'] = $contact_relation_uuid;
-		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');
 		if (is_array($row) && @sizeof($row) != 0) {
 			$relation_label = $row["relation_label"];
@@ -191,7 +184,6 @@
 	$sql .= "order by contact_organization desc, contact_name_given asc, contact_name_family asc ";
 	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 	$parameters['contact_uuid'] = $contact_relation_uuid;
-	$database = new database;
 	$contacts = $database->select($sql, $parameters, 'all');
 	if (!empty($contacts) && is_uuid($row['relation_contact_uuid'])) {
 		foreach($contacts as $field) {

core/contacts/contact_relations.php

@@ -61,7 +61,6 @@
 	$sql .= "c.contact_name_family asc ";
 	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 	$parameters['contact_uuid'] = $contact_uuid ?? '';
-	$database = new database;
 	$contact_relations = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 

core/contacts/contact_relations_view.php

@@ -58,7 +58,6 @@
 	$sql .= "c.contact_name_family asc ";
 	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 	$parameters['contact_uuid'] = $contact_uuid ?? '';
-	$database = new database;
 	$contact_relations = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 

core/contacts/contact_setting_edit.php

@@ -132,9 +132,6 @@
 					$p = permissions::new();
 					$p->add('contact_edit', 'temp');
 
-					$database = new database;
-					$database->app_name = 'contacts';
-					$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
 					$database->save($array);
 					unset($array);
 
@@ -167,9 +164,6 @@
 						$array['contact_settings'][0]['contact_setting_enabled'] = $contact_setting_enabled;
 						$array['contact_settings'][0]['contact_setting_description'] = $contact_setting_description;
 
-						$database = new database;
-						$database->app_name = 'contacts';
-						$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
 						$database->save($array);
 						unset($array);
 					}
@@ -188,7 +182,6 @@
 		$sql .= "and contact_setting_uuid = :contact_setting_uuid ";
 		$parameters['domain_uuid'] = $domain_uuid;
 		$parameters['contact_setting_uuid'] = $contact_setting_uuid;
-		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');
 		if (!empty($row)) {
 			$contact_setting_category = escape($row["contact_setting_category"]);

core/contacts/contact_settings.php

@@ -51,7 +51,6 @@
 	$sql .= ", contact_setting_order asc ";
 	$parameters['domain_uuid'] = $domain_uuid;
 	$parameters['contact_uuid'] = $contact_uuid ?? '';
-	$database = new database;
 	$contact_settings = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 

core/contacts/contact_time_edit.php

@@ -105,9 +105,6 @@
 				$p = permissions::new();
 				$p->add('contact_edit', 'temp');
 
-				$database = new database;
-				$database->app_name = 'contacts';
-				$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
 				$database->save($array);
 				unset($array);
 
@@ -134,9 +131,6 @@
 					$array['contact_times'][0]['time_stop'] = $time_stop;
 					$array['contact_times'][0]['time_description'] = $time_description;
 
-					$database = new database;
-					$database->app_name = 'contacts';
-					$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
 					$database->save($array);
 					unset($array);
 				}
@@ -161,7 +155,6 @@
 		$parameters['contact_uuid'] = $contact_uuid ?? '';
 		$parameters['user_uuid'] = $_SESSION["user"]["user_uuid"];
 		$parameters['contact_time_uuid'] = $contact_time_uuid;
-		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');
 		$time_start = $row["time_start"];
 		$time_stop = $row["time_stop"];

core/contacts/contact_timer.php

@@ -61,9 +61,6 @@
 		}
 
 		if (!empty($array)) {
-			$database = new database;
-			$database->app_name = 'contacts';
-			$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
 			$database->save($array);
 			unset($array);
 		}
@@ -82,7 +79,6 @@
 	$sql .= "and contact_uuid = :contact_uuid ";
 	$parameters['domain_uuid'] = $domain_uuid;
 	$parameters['contact_uuid'] = $contact_uuid;
-	$database = new database;
 	$row = $database->select($sql, $parameters, 'row');
 	if (!empty($row)) {
 		$contact_organization = $row["contact_organization"];
@@ -108,7 +104,6 @@
 	$parameters['domain_uuid'] = $domain_uuid;
 	$parameters['user_uuid'] = $_SESSION['user']['user_uuid'];
 	$parameters['contact_uuid'] = $contact_uuid ?? '';
-	$database = new database;
 	$row = $database->select($sql, $parameters, 'row');
 	if (!empty($row)) {
 		$contact_time_uuid = $row["contact_time_uuid"];

core/contacts/contact_timer_inc.php

@@ -47,7 +47,6 @@
 	$parameters['contact_uuid'] = $contact_uuid;
 	$parameters['user_uuid'] = $_SESSION['user']['user_uuid'];
 	$parameters['contact_time_uuid'] = $contact_time_uuid;
-	$database = new database;
 	$row = $database->select($sql, $parameters, 'row');
 	if (!empty($row)) {
 		$time_start = strtotime($row["time_start"]);

core/contacts/contact_times.php

@@ -54,7 +54,6 @@
 	$sql .= "order by ct.time_start desc ";
 	$parameters['domain_uuid'] = $domain_uuid;
 	$parameters['contact_uuid'] = $contact_uuid ?? '';
-	$database = new database;
 	$contact_times = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 

core/contacts/contact_times_view.php

@@ -46,7 +46,6 @@
 	$sql .= "order by ct.time_start desc ";
 	$parameters['domain_uuid'] = $domain_uuid;
 	$parameters['contact_uuid'] = $contact_uuid;
-	$database = new database;
 	$contact_times = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 

core/contacts/contact_url_edit.php

@@ -118,9 +118,6 @@
 				$p = permissions::new();
 				$p->add('contact_edit', 'temp');
 
-				$database = new database;
-				$database->app_name = 'contacts';
-				$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
 				$database->save($array);
 				unset($array);
 
@@ -133,7 +130,6 @@
 					$sql .= "and contact_uuid = :contact_uuid ";
 					$parameters['domain_uuid'] = $domain_uuid;
 					$parameters['contact_uuid'] = $contact_uuid;
-					$database = new database;
 					$database->execute($sql, $parameters ?? null);
 					unset($sql, $parameters);
 				}
@@ -159,9 +155,6 @@
 					$array['contact_urls'][0]['url_primary'] = $url_primary ? 1 : 0;
 					$array['contact_urls'][0]['url_description'] = $url_description;
 
-					$database = new database;
-					$database->app_name = 'contacts';
-					$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
 					$database->save($array);
 					unset($array);
 				}
@@ -180,7 +173,6 @@
 		$sql .= "and contact_url_uuid = :contact_url_uuid ";
 		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 		$parameters['contact_url_uuid'] = $contact_url_uuid;
-		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');
 		if (!empty($row)) {
 			$url_label = $row["url_label"];

core/contacts/contact_urls.php

@@ -49,7 +49,6 @@
 	$sql .= "order by url_primary desc, url_label asc ";
 	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 	$parameters['contact_uuid'] = $contact_uuid ?? '';
-	$database = new database;
 	$contact_urls = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 

core/contacts/contact_urls_view.php

@@ -44,7 +44,6 @@
 	$sql .= "order by url_primary desc, url_label asc ";
 	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 	$parameters['contact_uuid'] = $contact_uuid ?? '';
-	$database = new database;
 	$contact_urls = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 

core/contacts/contact_view.php

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

core/contacts/contacts.php

@@ -116,7 +116,6 @@
 	}
 	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 	$parameters['group_uuid'] = $_SESSION['group_uuid'] ?? '';
-	$database = new database;
 	$result = $database->select($sql, $parameters, 'all');
 	if (!empty($result)) {
 		foreach($result as $row) {
@@ -228,7 +227,6 @@
 		$parameters['user_uuid'] = $_SESSION['user_uuid'];
 	}
 	$sql .= $sql_search ?? '';
-	$database = new database;
 	$num_rows = $database->select($sql, $parameters ?? null, 'column');
 
 //prepare to page the results
@@ -281,7 +279,6 @@
 		$parameters['user_uuid'] = $_SESSION['user_uuid'];
 	}
 	$sql .= $sql_search ?? '';
-	$database = new database;
 	if (!empty($order_by)) {
 		$sql .= order_by($order_by, $order);
 		$sql .= ", contact_organization asc ";
@@ -296,7 +293,6 @@
 		}
 	}
 	$sql .= limit_offset($rows_per_page, $offset);
-	$database = new database;
 	$contacts = $database->select($sql, $parameters ?? null, 'all');
 	unset($sql, $parameters);
 

core/contacts/contacts_vcard.php

@@ -53,7 +53,6 @@ if (!empty($_GET)) {
 		$sql .= "and contact_uuid = :contact_uuid ";
 		$parameters['domain_uuid'] = $domain_uuid;
 		$parameters['contact_uuid'] = $contact_uuid;
-		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');
 		if (!empty($row)) {
 			$contact_type = $row["contact_type"];
@@ -79,7 +78,6 @@ if (!empty($_GET)) {
 		$sql .= "order by email_primary desc ";
 		$parameters['domain_uuid'] = $domain_uuid;
 		$parameters['contact_uuid'] = $contact_uuid;
-		$database = new database;
 		$result = $database->select($sql, $parameters, 'all');
 		if (!empty($result)) {
 			$e = 1;
@@ -97,7 +95,6 @@ if (!empty($_GET)) {
 		$sql .= "and url_primary = true ";
 		$parameters['domain_uuid'] = $domain_uuid;
 		$parameters['contact_uuid'] = $contact_uuid;
-		$database = new database;
 		$url_address = $database->select($sql, $parameters, 'column');
 		$vcard->data['url'] = $url_address;
 		unset($sql, $parameters, $row);
@@ -121,7 +118,6 @@ if (!empty($_GET)) {
 		$sql .= "and contact_uuid = :contact_uuid ";
 		$parameters['domain_uuid'] = $domain_uuid;
 		$parameters['contact_uuid'] = $contact_uuid;
-		$database = new database;
 		$result = $database->select($sql, $parameters, 'all');
 		if (!empty($result)) {
 			foreach ($result as $row) {
@@ -150,7 +146,6 @@ if (!empty($_GET)) {
 			$sql .= "and contact_uuid = :contact_uuid ";
 			$parameters['domain_uuid'] = $domain_uuid;
 			$parameters['contact_uuid'] = $contact_uuid;
-			$database = new database;
 			$result = $database->select($sql, $parameters, 'all');
 			if (!empty($result)) {
 				foreach ($result as $row) {

core/dashboard/dashboard.php

@@ -105,7 +105,6 @@
 		$sql .= ")\n";
 		$parameters['search'] = '%'.strtolower($search).'%';
 	}
-	$database = new database;
 	$num_rows = $database->select($sql, $parameters ?? null, 'column');
 	unset($sql, $parameters);
 
@@ -140,7 +139,6 @@
 	}
 	$sql .= order_by($order_by, $order, 'dashboard_name', 'asc');
 	$sql .= limit_offset($rows_per_page ?? null, $offset ?? null);
-	$database = new database;
 	$dashboards = $database->select($sql, $parameters ?? null, 'all');
 	unset($sql, $parameters);
 

core/dashboard/dashboard_edit.php

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

core/dashboard/dashboard_widget_edit.php

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

core/dashboard/dashboard_widget_list.php

@@ -89,7 +89,6 @@
 	$sql .= "from v_dashboard_widgets ";
 	$sql .= "where dashboard_uuid = :dashboard_uuid ";
 	$parameters['dashboard_uuid'] = $dashboard_uuid;
-	$database = new database;
 	$num_rows = $database->select($sql, $parameters ?? null, 'column');
 	unset($sql, $parameters);
 
@@ -117,7 +116,6 @@
 	$sql .= "where dashboard_uuid = :dashboard_uuid ";
 	$sql .= order_by($order_by, $order, 'widget_order, widget_name', 'asc');
 	$sql .= limit_offset($rows_per_page ?? null, $offset ?? null);
-	$database = new database;
 	$parameters['dashboard_uuid'] = $dashboard_uuid;
 	$result = $database->select($sql, $parameters ?? null, 'all');
 	unset($sql, $parameters);
@@ -150,7 +148,6 @@
 
 	//get the group list
 	$sql = "select group_uuid, group_name from v_groups ";
-	$database = new database;
 	$groups = $database->select($sql, $parameters ?? null, 'all');
 	unset($sql, $parameters);
 

core/dashboard/index.php

@@ -45,9 +45,6 @@
 //additional includes
 	require_once "resources/check_auth.php";
 
-//initialize the database
-	$database = new database;
-
 //disable login message
 	if (isset($_GET['msg']) && $_GET['msg'] == 'dismiss') {
 		unset($_SESSION['login']['message']['text']);

core/databases/database_edit.php

@@ -37,9 +37,6 @@
 		exit;
 	}
 
-//connect to the database
-	$database = new database;
-
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
@@ -91,8 +88,7 @@ if (count($_POST)>0 && empty($_POST["persistformvar"])) {
 					$array[0]['checked'] = 'true';
 					$array[0]['uuid'] = $database_uuid;
 				//delete
-					$obj = new databases;
-					$obj->delete($array);
+					$database->delete($array);
 				//redirect
 					header('Location: databases.php');
 					exit;

core/databases/databases.php

@@ -59,14 +59,12 @@
 		switch ($action) {
 			case 'copy':
 				if (permission_exists('database_add')) {
-					$obj = new databases;
-					$obj->copy($databases);
+					$database->copy($databases);
 				}
 				break;
 			case 'delete':
 				if (permission_exists('database_delete')) {
-					$obj = new databases;
-					$obj->delete($databases);
+					$database->delete($databases);
 				}
 				break;
 		}

core/default_settings/default_setting_edit.php

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

core/default_settings/default_setting_toggle.php

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

core/domain_settings/domain_setting_edit.php

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

core/domain_settings/domain_settings.php

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

core/domains/domain_json.php

@@ -37,9 +37,6 @@
 		exit;
 	}
 
-//connect to the database
-	$database = new database;
-
 //get posted data
 	if (!empty($_POST['search'])) {
 		$search = $_POST['search'];

core/domains/domains.php

@@ -29,9 +29,6 @@
 	require_once "resources/check_auth.php";
 	require_once "resources/paging.php";
 
-//connect to the database
-	$database = new database;
-
 //redirect admin to app instead
 	if (file_exists($_SERVER["PROJECT_ROOT"]."/app/domains/app_config.php") && !permission_exists('domain_all') && !is_cli()) {
 		header("Location: ".PROJECT_PATH."/app/domains/domains.php");

core/groups/group_member_add.php

@@ -43,9 +43,6 @@
 		return;
 	}
 
-//connect to the database
-	$database = new database;
-
 //get the http values and set them as variables
 	$domain_uuid = $_POST["domain_uuid"];
 	$group_uuid = $_POST["group_uuid"];

core/groups/group_members.php

@@ -43,9 +43,6 @@
 		return;
 	}
 
-//connect to the database
-	$database = new database;
-
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();

core/groups/group_permissions.php

@@ -42,9 +42,6 @@
 		$group_uuid = $_GET['group_uuid'];
 	}
 
-//connect to the database
-	$database = new database;
-
 //get the group_name
 	if (isset($group_uuid) && is_uuid($group_uuid)) {
 		$sql = "select group_name from v_groups ";

core/groups/groups.php

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

core/groups/permissions_copy.php

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

core/install/install.php

@@ -189,7 +189,7 @@
 			$sql = "select domain_uuid from v_domains ";
 			$sql .= "where domain_name = :domain_name ";
 			$parameters['domain_name'] = $domain_name;
-			$database = new database;
+
 			$domain_uuid = $database->select($sql, $parameters, 'column');
 			unset($parameters);
 
@@ -214,12 +214,8 @@
 				$array['domains'][0]['domain_enabled'] = 'true';
 
 				//save to the user data
-				$database = new database;
-				$database->app_name = 'domains';
-				$database->app_uuid = 'b31e723a-bf70-670c-a49b-470d2a232f71';
-				$database->uuid($domain_uuid);
 				$database->save($array);
-				$message = $database->message;
+				//$message = $database->message;
 				unset($array);
 
 				//remove the temporary permission
@@ -245,8 +241,6 @@
 			$sql .= "and username = :username ";
 			$parameters['domain_uuid'] = $domain_uuid;
 			$parameters['username'] = $admin_username;
-
-			$database = new database;
 			$user_uuid = $database->select($sql, $parameters, 'column');
 			unset($parameters);
 
@@ -266,7 +260,6 @@
 			$sql = "select group_uuid from v_groups ";
 			$sql .= "where group_name = :group_name ";
 			$parameters['group_name'] = 'superadmin';
-			$database = new database;
 			$group_uuid = $database->select($sql, $parameters, 'column');
 			unset($parameters);
 
@@ -288,9 +281,6 @@
 			$array['user_groups'][0]['group_name'] = 'superadmin';
 			$array['user_groups'][0]['group_uuid'] = $group_uuid;
 			$array['user_groups'][0]['user_uuid'] = $user_uuid;
-			$database = new database;
-			$database->app_name = 'users';
-			$database->app_uuid = '112124b3-95c2-5352-7e9d-d14c0b88f207';
 			$database->uuid($user_uuid);
 			$database->save($array);
 			$message = $database->message;

core/menu/menu.php

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

core/menu/menu_edit.php

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

core/menu/menu_item_edit.php

@@ -41,9 +41,6 @@
 	$language = new text;
 	$text = $language->get();
 
-//connect to the database
-	$database = new database;
-
 //define the variables
 	$menu_uuid = null;
 	$menu_item_uuid = null;

core/menu/menu_item_list.php

@@ -37,9 +37,6 @@
 		exit;
 	}
 
-//initialize the database
-	$database = new database;
-
 //get the http post data
 	if (!empty($_POST['menu_items'])) {
 		$action = $_POST['action'];
@@ -246,7 +243,6 @@
 
 	//get the group list
 	$sql = "select group_uuid, group_name from v_groups ";
-	$database = new database;
 	$groups = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 

core/menu/menu_item_move_down.php

@@ -37,9 +37,6 @@
 		return;
 	}
 
-//connect to the database
-	$database = new database;
-
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();

core/menu/menu_item_move_up.php

@@ -36,9 +36,6 @@
 		return;
 	}
 
-//connect to the database
-	$database = new database;
-
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();

core/notifications/notification_edit.php

@@ -37,9 +37,6 @@ Mark J Crane <markjcrane@fusionpbx.com>
 		exit;
 	}
 
-//connect to the database
-	$database = new database;
-
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();

core/upgrade/upgrade_menu.php

@@ -346,7 +346,6 @@ function do_upgrade_menu() {
 	$sql = "select menu_uuid, menu_language from v_menus ";
 	$sql .= "where menu_name = :menu_name ";
 	$parameters['menu_name'] = 'default';
-	$database = new database;
 	$row = $database->select($sql, $parameters, 'row');
 	if (is_array($row) && sizeof($row) != 0) {
 		$menu_uuid = $row["menu_uuid"];

core/user_logs/user_log_edit.php

@@ -27,7 +27,6 @@
 		//$sql .= "and domain_uuid = :domain_uuid ";
 		//$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 		$parameters['user_log_uuid'] = $user_log_uuid;
-		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');
 		if (is_array($row) && @sizeof($row) != 0) {
 			$domain_uuid = $row["domain_uuid"];
@@ -55,7 +54,6 @@
 	$sql .= "WHERE domain_uuid = :domain_uuid ";
 	$sql .= "ORDER by username asc ";
 	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
-	$database = new database;
 	$users = $database->execute($sql, $parameters, 'all');
 	unset ($sql, $parameters);
 

core/user_settings/user_setting_edit.php

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

core/user_settings/user_settings.php

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

core/users/user_imports.php

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

core/users/user_json.php

@@ -43,9 +43,6 @@
 		$search =  strtolower($_GET["search"]);
 	}
 
-//connect to the database
-	$database = new database;
-
 //check to see if contact details are in the view
 	$sql = "select * from view_users ";
 	$sql .= "where domain_uuid = :domain_uuid ";

core/users/users.php

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