Use the database::new method

index.php

@@ -10,6 +10,9 @@
 	require_once "resources/functions/message_media_builder.php";
 	require_once "resources/pdo.php";
 
+//connect to the database
+	$database = database::new();
+
 //debug
 	if ($_SESSION['message']['debug']['boolean'] == 'true') {
 		$debug = true;
@@ -32,7 +35,6 @@
 	$sql .= "where provider_address_cidr is not null ";
 	$sql .= "and provider_address_enabled = true ";
 	$parameters = null;
-	$database = new database;
 	$provider_addresses = $database->select($sql, $parameters, 'all');
 
 //default authorized to false
@@ -88,7 +90,6 @@
 	$sql .= "and provider_setting_enabled = 'true' \n";
 	$sql .= "and provider_setting_category = 'inbound' \n";
 	$parameters['provider_uuid'] = $provider_uuid;
-	$database = new database;
 	$provider_settings = $database->select($sql, $parameters, 'all');
 	foreach ($provider_settings as $row) {
 		if ($row['provider_setting_subcategory'] == 'content') {
@@ -417,7 +418,6 @@ if (count($message_content) == 3) {
 		file_put_contents($log_file, "sql: ".$sql."\n", FILE_APPEND);
 		file_put_contents($log_file, print_r($parameters, true)."\n", FILE_APPEND);
 	}
-	$database = new database;
 	$row = $database->select($sql, $parameters, 'row');
 	$domain_uuid = $row['domain_uuid'];
 	$user_uuid = $row['user_uuid'];
@@ -435,7 +435,6 @@ if (count($message_content) == 3) {
 	$sql .= "and c.domain_uuid = :domain_uuid ";
 	$parameters['phone_number'] = $destination_number;
 	$parameters['domain_uuid'] = $domain_uuid;
-	$database = new database;
 	$contact_uuid = $database->select($sql, $parameters, 'column');
 	unset($sql, $parameters);
 
@@ -585,8 +584,7 @@ if (count($message_content) == 3) {
 	//	file_put_contents($log_file, print_r($array, true), FILE_APPEND);
 	//}
 
-//save message to the database
-	$database = new database;
+//save message to the database;
 	$database->app_name = 'messages';
 	$database->app_uuid = '4a20815d-042c-47c8-85df-085333e79b87';
 	$database->save($array, false);
@@ -613,7 +611,6 @@ if (count($message_content) == 3) {
 	$sql .= "and e.domain_uuid = d.domain_uuid ";
 	$sql .= "and e.enabled = 'true' ";
 	$parameters['user_uuid'] = $user_uuid;
-	$database = new database;
 	$extensions = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 

message_contact.php

@@ -41,6 +41,9 @@
 	$language = new text;
 	$text = $language->get(null, '/app/contacts');
 
+//connect to the database
+	$database = database::new();
+
 //action add or update
 	if (!empty($_REQUEST["id"]) && is_uuid($_REQUEST["id"])) {
 		$contact_uuid = $_REQUEST["id"];
@@ -74,7 +77,6 @@
 	}
 	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 
-	$database = new database;
 	$row = $database->select($sql, $parameters, 'row');
 	if (!empty($row)) {
 		$contact_uuid = $row["contact_uuid"];
@@ -102,7 +104,6 @@
 		$sql .= "where domain_uuid = :domain_uuid ";
 		$sql .= "order by username asc ";
 		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
-		$database = new database;
 		$users = $database->select($sql, $parameters ?? null, 'all');
 		unset($sql, $parameters);
 
@@ -125,7 +126,6 @@
 		$sql .= "order by u.username asc ";
 		$parameters['contact_uuid'] = $contact_uuid;
 		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
-		$database = new database;
 		$contact_users_assigned = $database->select($sql, $parameters, 'all');
 		unset($sql, $parameters);
 
@@ -140,7 +140,6 @@
 		$parameters['domain_uuid'] = $domain_uuid;
 		$parameters['contact_uuid'] = $contact_uuid;
 		$parameters['group_uuid'] = $_SESSION["user_uuid"];
-		$database = new database;
 		$contact_groups_assigned = $database->select($sql, $parameters, 'all');
 		if (!empty($contact_groups_assigned)) {
 			foreach ($contact_groups_assigned as $field) {
@@ -157,7 +156,6 @@
 		}
 		$sql .= "order by group_name asc ";
 		$parameters['domain_uuid'] = $domain_uuid;
-		$database = new database;
 		$contact_groups_available = $database->select($sql, $parameters, 'all');
 		unset($sql, $parameters, $contact_groups);
 	}

message_edit.php

@@ -37,6 +37,9 @@
 		exit;
 	}
 
+//connect to the database
+	$database = database::new();
+
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
@@ -143,7 +146,6 @@
 			$array['messages'][0]['message_uuid'] = $message_uuid;
 
 		//save to the data
-			$database = new database;
 			$database->app_name = 'messages';
 			$database->app_uuid = '4a20815d-042c-47c8-85df-085333e79b87';
 			$database->save($array);
@@ -167,7 +169,6 @@
 		$sql = "select * from v_messages ";
 		$sql .= "where message_uuid = :message_uuid ";
 		$parameters['message_uuid'] = $message_uuid;
-		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');
 		if (!empty($row) && @sizeof($row) != 0) {
 			$user_uuid = $row["user_uuid"];
@@ -191,7 +192,6 @@
 	$sql .= "and user_enabled = 'true' ";
 	$sql .= "order by username asc ";
 	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
-	$database = new database;
 	$users = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 

message_logs.php

@@ -38,6 +38,9 @@
 		exit;
 	}
 
+//connect to the database
+	$database = database::new();
+
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
@@ -97,7 +100,6 @@
 		$parameters['user_uuid'] = $_SESSION['user_uuid'];
 		$parameters['domain_uuid'] = $domain_uuid;
 	}
-	$database = new database;
 	$num_rows = $database->select($sql, $parameters ?? null, 'column');
 
 //prepare to page the results
@@ -117,7 +119,6 @@
 	$sql = str_replace('count(*)', '*', $sql);
 	$sql .= "order by message_date desc ";
 	$sql .= limit_offset($rows_per_page, $offset ?? 0);
-	$database = new database;
 	$messages = $database->select($sql, $parameters ?? null, 'all');
 	unset($sql, $parameters);
 

message_media.php

@@ -46,6 +46,8 @@
 
 //get media
 	if (is_uuid($message_media_uuid)) {
+		//connect to the database
+		$database = database::new();
 
 		//get the media details from the database
 		$sql = "select mm.message_media_name, mm.message_media_type, mm.message_media_url, mm.message_media_content ";
@@ -61,7 +63,6 @@
 			$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 		}
 		$parameters['message_media_uuid'] = $message_media_uuid;
-		$database = new database;
 		$media = $database->select($sql, $parameters, 'row');
 		unset($sql, $parameters);
 

message_queue.php

@@ -38,6 +38,9 @@
 		exit;
 	}
 
+//connect to the database
+	$database = database::new();
+
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
@@ -97,7 +100,6 @@
 		$parameters['user_uuid'] = $_SESSION['user_uuid'];
 		$parameters['domain_uuid'] = $domain_uuid;
 	}
-	$database = new database;
 	$num_rows = $database->select($sql, $parameters, 'column');
 
 //prepare to page the results
@@ -117,7 +119,6 @@
 	$sql = str_replace('count(*)', '*', $sql);
 	$sql .= "order by message_date desc ";
 	$sql .= limit_offset($rows_per_page, $offset);
-	$database = new database;
 	$messages = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 

messages.php

@@ -34,6 +34,9 @@
 		exit;
 	}
 
+//connect to the database
+	$database = database::new();
+
 //missing application - app/providers is required
 	if (!file_exists($_SERVER["PROJECT_ROOT"].'/app/providers/app_config.php')) {
 		$document['title'] = $text['title-messages'];
@@ -81,7 +84,6 @@
 	$sql .= "order by destination_number asc ";
 	$parameters['domain_uuid'] = $domain_uuid;
 	$parameters['user_uuid'] = $_SESSION['user']['user_uuid'];
-	$database = new database;
 	$rows = $database->select($sql, $parameters, 'all');
 	if (is_array($rows) && @sizeof($rows)) {
 		foreach ($rows as $row) {
@@ -108,7 +110,6 @@
 		$sql .= "and attachment_primary = 1 ";
 		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 		$parameters['contact_uuid'] = $_SESSION['user']['contact_uuid'];
-		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');
 		$_SESSION['tmp']['messages']['contact_me'] = $row;
 		unset($sql, $parameters, $row);

messages_contacts.php

@@ -38,6 +38,10 @@
 	$language = new text;
 	$text = $language->get();
 
+//connect to the database
+	//connect to the database
+	$database = database::new();
+
 //get selected number/contact
 	if (isset($_GET['number']) && !empty($_GET['number'])) {
 		$_SESSION['user']['contact_number'] = $_GET['number'];
@@ -151,11 +155,10 @@
 
 	//uncomment below to have the selected message pop up to the top of the list
 	//$parameters['number'] = $_SESSION['user']['contact_number'] ?? null;
-//echo "<pre>\n";
-//echo $sql;
-//echo "</pre>\n";
-//view_array($parameters);
-	$database = new database;
+	//echo "<pre>\n";
+	//echo $sql;
+	//echo "</pre>\n";
+	//view_array($parameters);
 	$contacts = $database->select($sql, $parameters, 'all');
 	//view_array($contacts);
 	unset($sql, $parameters);
@@ -402,4 +405,5 @@
 	//echo "</center>\n";
 
 	echo "</html>\n";
+
 ?>

messages_thread.php

@@ -38,6 +38,9 @@
 	$language = new text;
 	$text = $language->get();
 
+//connect to the database
+	$database = database::new();
+
 //santize the contact number, allow the + to support e.164 format
 	if (isset($_GET['number'])) {
 		$number = preg_replace("/[^\+?0-9]/", "", $_GET['number']);
@@ -104,7 +107,6 @@
 	$parameters['domain_uuid'] = $domain_uuid;
 	$parameters['message_number'] = $number ?? null;
 	$parameters['message_limit'] = $message_limit;
-	$database = new database;
 	$messages = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 
@@ -128,7 +130,6 @@
 			$sql .= ") ";
 			$sql .= "and message_media_type <> 'txt' ";
 			$parameters['domain_uuid'] = $domain_uuid;
-			$database = new database;
 			$rows = $database->select($sql, $parameters, 'all');
 			unset($sql, $parameters, $index);
 
@@ -151,7 +152,6 @@
 	$parameters['user_uuid'] = $_SESSION['user_uuid'];
 	$parameters['domain_uuid'] = $domain_uuid;
 	$parameters['message_number'] = $number ?? null;
-	$database = new database;
 	$database->execute($sql, $parameters);
 	unset($sql, $parameters);