Remove redundant database objects

This reduces database connections and improves performance.

core/authentication/app_defaults.php

@@ -75,7 +75,6 @@
 				$parameters['email_template_uuid_'.$index] = $uuid;
 			}
 			$sql .= implode(' or ', $sql_where);
-			$database = new database;
 			$email_templates = $database->select($sql, $parameters, 'all');
 			unset($sql, $sql_where, $parameters);
 
@@ -100,7 +99,6 @@
 			$p->add("email_template_edit", 'temp');
 
 			//save the data
-			$database = new database;
 			$database->app_name = 'email_templates';
 			$database->app_uuid = '8173e738-2523-46d5-8943-13883befd2fd';
 			$database->save($array);

core/dashboard/app_defaults.php

@@ -14,7 +14,6 @@ if ($domains_processed == 1) {
 	//get the groups
 		$sql = "select * from v_groups ";
 		$sql .= "where domain_uuid is null ";
-		$database = new database;
 		$groups = $database->select($sql, null, 'all');
 
 	//get the dashboard
@@ -26,7 +25,6 @@ if ($domains_processed == 1) {
 		$sql .= "cast(dashboard_enabled as text), ";
 		$sql .= "dashboard_description ";
 		$sql .= "from v_dashboard ";
-		$database = new database;
 		$dashboard_widgets = $database->select($sql, null, 'all');
 		unset($sql, $parameters);
 
@@ -110,7 +108,6 @@ if ($domains_processed == 1) {
 
 	//save the data
 		if (!empty($array)) {
-			$database = new database;
 			$database->app_name = 'dashboard';
 			$database->app_uuid = '55533bef-4f04-434a-92af-999c1e9927f7';
 			$database->save($array, false);

core/databases/app_defaults.php

@@ -30,7 +30,6 @@ if (!empty($domains_processed) && $domains_processed == 1) {
 	//set the database driver
 		$sql = "select * from v_databases ";
 		$sql .= "where database_driver is null ";
-		$database = new database;
 		$result = $database->select($sql, null, 'all');
 		foreach ($result as &$row) {
 			$database_uuid = $row["database_uuid"];
@@ -47,7 +46,6 @@ if (!empty($domains_processed) && $domains_processed == 1) {
 			$sql .= "where database_uuid = :database_uuid ";
 			$parameters['database_driver'] = $database_driver;
 			$parameters['database_uuid'] = $database_uuid;
-			$database = new database;
 			$database->execute($sql, $parameters);
 			unset($sql, $parameters);
 		}

core/default_settings/app_defaults.php

@@ -31,7 +31,6 @@
 			$sql = "update v_default_settings ";
 			$sql .= "set default_setting_name = 'text' ";
 			$sql .= "where default_setting_name = 'var' ";
-			$database = new database;
 			$database->execute($sql, null);
 			unset($sql);
 
@@ -39,13 +38,11 @@
 			$sql = "delete from v_default_settings ";
 			$sql .= "where (default_setting_category is null and default_setting_subcategory is null) ";
 			$sql .= "or (default_setting_category = '' and default_setting_subcategory = '') ";
-			$database = new database;
 			$database->execute($sql, null);
 			unset($sql);
 
 		//populate the languages table, if necessary
 			$sql = "select count(*) from v_languages";
-			$database = new database;
 			$num_rows = $database->select($sql, null, 'column');
 			if ($num_rows == 0) {
 				$sql = "insert into v_languages (language_uuid, language, code) values ";
@@ -205,14 +202,12 @@
 				$sql .= "('".uuid()."', 'Welsh', 'cy'), ";
 				$sql .= "('".uuid()."', 'Xhosa', 'xh'), ";
 				$sql .= "('".uuid()."', 'Yiddish', 'yi') ";
-				$database = new database;
 				$database->execute($sql, null);
 				unset($sql, $parameters);
 			}
 
 		//populate the countries table, if necessary
 			$sql = "select count(*) from v_countries";
-			$database = new database;
 			$num_rows = $database->select($sql, null, 'column');
 			if ($num_rows == 0) {
 				$sql = "insert into v_countries (country_uuid, country, iso_a2, iso_a3, num, country_code) values ";
@@ -482,7 +477,6 @@
 				$sql .= "and default_setting_category = 'domain' ";
 				$parameters['language_code'] = $language_code;
 				$parameters['legacy_code'] = $legacy_code;
-				$database = new database;
 				$database->execute($sql, $parameters);
 				unset($sql, $parameters);
 			}
@@ -498,7 +492,6 @@
 			$sql .= "and default_setting_category = 'domain' ";
 			$sql .= "and default_setting_subcategory = 'time_zone' ";
 			$sql .= "and default_setting_name = 'name' ";
-			$database = new database;
 			$database->execute($sql);
 			unset($sql);
 
@@ -509,7 +502,6 @@
 			$sql .= "where default_setting_category = 'login' ";
 			$sql .= "and default_setting_subcategory = 'destination' ";
 			$sql .= "and default_setting_name = 'url' ";
-			$database = new database;
 			$database->execute($sql);
 			unset($sql);
 

core/domain_settings/app_defaults.php

@@ -31,7 +31,6 @@
 			$sql = "update v_domain_settings ";
 			$sql .= "set domain_setting_name = 'text' ";
 			$sql .= "where domain_setting_name = 'var' ";
-			$database = new database;
 			$database->execute($sql, null);
 			unset($sql, $parameters);
 
@@ -49,7 +48,6 @@
 				$sql .= "and domain_setting_category = 'domain'";
 				$parameters['language_code'] = $language_code;
 				$parameters['legacy_code'] = $legacy_code;
-				$database = new database;
 				$database->execute($sql, $parameters);
 				unset($sql, $parameters);
 			}
@@ -59,7 +57,6 @@
 			$sql .= "set domain_setting_value = '#fafafa' ";
 			$sql .= "where domain_setting_subcategory = 'message_default_color' ";
 			$sql .= "and domain_setting_value = '#ccffcc' ";
-			$database = new database;
 			$database->execute($sql, null);
 			unset($sql, $parameters);
 
@@ -67,7 +64,6 @@
 			$sql .= "set domain_setting_value = '#666' ";
 			$sql .= "where domain_setting_subcategory = 'message_default_background_color' ";
 			$sql .= "and domain_setting_value = '#004200' ";
-			$database = new database;
 			$database->execute($sql, null);
 			unset($sql, $parameters);
 

core/domains/app_defaults.php

@@ -30,7 +30,6 @@
 		//set domains with enabled status of empty or null to true
 			$sql = "update v_domains set domain_enabled = 'true' ";
 			$sql .= "where domain_enabled = '' or domain_enabled is null ";
-			$database = new database;
 			$database->execute($sql, null);
 			unset($sql);
 

core/groups/app_defaults.php

@@ -33,7 +33,6 @@ if ($domains_processed == 1) {
 	//find rows that have a null group_uuid and set the correct group_uuid
 		$sql = "select * from v_user_groups ";
 		$sql .= "where group_uuid is null; ";
-		$database = new database;
 		$result = $database->select($sql, null, 'all');
 		if (is_array($result)) {
 			foreach($result as $row) {
@@ -42,7 +41,6 @@ if ($domains_processed == 1) {
 						$sql = "select group_uuid from v_groups ";
 						$sql .= "where group_name = :group_name ";
 						$parameters['group_name'] = $row['group_name'];
-						$database = new database;
 						$group_uuid = $database->select($sql, $parameters, 'column');
 						unset($sql, $parameters);
 
@@ -52,7 +50,6 @@ if ($domains_processed == 1) {
 						$sql .= "where user_group_uuid = :user_group_uuid; ";
 						$parameters['group_uuid'] = $group_uuid;
 						$parameters['user_group_uuid'] = $row['user_group_uuid'];
-						$database = new database;
 						$database->execute($sql, $parameters);
 						unset($sql, $parameters);
 				}
@@ -63,7 +60,6 @@ if ($domains_processed == 1) {
 	//set the default group levels
 		$sql = "select * from v_groups ";
 		$sql .= "where group_level is null; ";
-		$database = new database;
 		$result = $database->select($sql, null, 'all');
 		if (is_array($result) && count($result) > 0) {
 			$x = 0;
@@ -90,7 +86,6 @@ if ($domains_processed == 1) {
 				}
 				$x++;
 			}
-			$database = new database;
 			$database->app_name = 'groups';
 			$database->app_uuid = '2caf27b0-540a-43d5-bb9b-c9871a1e4f84';
 			$database->save($array, false);
@@ -105,12 +100,10 @@ if ($domains_processed == 1) {
 		$sql .= ") ";
 		$sql .= "WHERE group_uuid is null; ";
 		$parameters = null;
-		$database = new database;
 		$database->execute($sql, $parameters);
 		unset($sql, $parameters);
 
 	//drop the view_groups
-		$database = new database;
 		$database->execute("DROP VIEW view_groups;", null);
 
 	//add or update the view
@@ -122,12 +115,10 @@ if ($domains_processed == 1) {
 		$sql .= "	group_level, group_protected, group_description ";
 		$sql .= "	from v_groups as g ";
 		$sql .= ");";
-		$database = new database;
 		$database->execute($sql, null);
 		unset($sql);
 
 	//group permissions 
-		$database = new database;
 		$database->execute("update v_group_permissions set permission_protected = 'false' where permission_protected is null;", null);
 		$database->execute("update v_group_permissions set permission_assigned = 'true' where permission_assigned is null;", null);
 

core/notifications/app_defaults.php

@@ -30,7 +30,6 @@ if ($domains_processed == 1) {
 	//update the notifications table
 	//if (is_array($_SESSION['switch']['scripts'])) {
 	//	$sql = "select count(*) from v_notifications ";
-	//	$database = new database;
 	//	$num_rows = $database->select($sql, null, 'column');
 	//	if ($num_rows == 0) {
 	//		//build insert array
@@ -40,7 +39,6 @@ if ($domains_processed == 1) {
 	//			$p = new permissions;
 	//			$p->add('notification_add', 'temp');
 	//		//execute insert
-	//			$database = new database;
 	//			$database->app_name = 'notifications';
 	//			$database->app_uuid = 'e746fbcb-f67f-4e0e-ab64-c414c01fac11';
 	//			$database->save($array, false);

core/permissions/app_defaults.php

@@ -4,7 +4,6 @@ if ($domains_processed == 1) {
 
 	//add the permissions
 		$sql = "select * from v_permissions \n";
-		$database = new database;
 		$database_permissions = $database->select($sql, null, 'all');
 
 	//get the $apps array from the installed apps from the core and mod directories
@@ -50,7 +49,6 @@ if ($domains_processed == 1) {
 				$p->add('permission_add', 'temp');
 
 			//execute insert
-				$database = new database;
 				$database->app_name = 'permissions';
 				$database->app_uuid = 'ce1498a0-46e2-487d-85de-4eec7122a984';
 				$database->save($array, false);

core/software/app_defaults.php

@@ -31,7 +31,6 @@ if ($domains_processed == 1) {
 
 	//update the software table
 		$sql = "select software_version from v_software ";
-		$database = new database;
 		$software_version = $database->select($sql, null, 'column');
 		if (empty($software_version)) {
 			$array['software'][0]['software_uuid'] = '7de057e7-333b-4ebf-9466-315ae7d44efd';
@@ -52,7 +51,6 @@ if ($domains_processed == 1) {
 			$p->add("software_edit", 'temp');
 
 			//save the data
-			$database = new database;
 			$database->app_name = 'software';
 			$database->app_uuid = 'b88c795f-7dea-4fc8-9ab7-edd555242cff';
 			$database->save($array, false);

core/upgrade/app_defaults.php

@@ -36,7 +36,6 @@ if ($domains_processed == 1) {
 		$sql .= "where default_setting_category = 'login' ";
 		$sql .= "and default_setting_subcategory = 'message' ";
 		$sql .= "and default_setting_name = 'text' ";
-		$database = new database;
 		$num_rows = $database->select($sql, null, 'column');
 		if ($num_rows == 0) {
 
@@ -62,7 +61,6 @@ if ($domains_processed == 1) {
 			$sql .= "'' ";
 			$sql .= ")";
 			$parameters['default_setting_value'] = $text['login-message_text'];
-			$database = new database;
 			$database->execute($sql, $parameters);
 			unset($sql, $parameters);
 
@@ -75,7 +73,6 @@ if ($domains_processed == 1) {
 			$sql .= "where default_setting_category = 'login' ";
 			$sql .= "and default_setting_subcategory = 'message' ";
 			$sql .= "and default_setting_name = 'text' ";
-			$database = new database;
 			$result = $database->select($sql, null, 'all');
 			if (is_array($result) && count($result) > 0) {
 				foreach($result as $row) {
@@ -93,7 +90,6 @@ if ($domains_processed == 1) {
 					$sql .= "where default_setting_uuid = :default_setting_uuid ";
 					$parameters['default_setting_value'] = $text['login-message_text'];
 					$parameters['default_setting_uuid'] = $current_default_setting_uuid;
-					$database = new database;
 					$database->execute($sql, $parameters);
 					unset($sql, $parameters);
 				}

core/user_settings/app_defaults.php

@@ -39,7 +39,6 @@
 				$sql .= "and user_setting_category = 'domain'";
 				$parameters['language_code'] = $language_code;
 				$parameters['legacy_code'] = $legacy_code;
-				$database = new database;
 				$database->execute($sql, $parameters);
 				unset($sql, $parameters);
 			}
@@ -48,7 +47,6 @@
 			$sql .= "set user_setting_value = '#fafafa' ";
 			$sql .= "where user_setting_subcategory = 'message_default_color' ";
 			$sql .= "and user_setting_value = '#ccffcc' ";
-			$database = new database;
 			$database->execute($sql, null);
 			unset($sql);
 
@@ -56,7 +54,6 @@
 			$sql .= "set user_setting_value = '#666' ";
 			$sql .= "where user_setting_subcategory = 'message_default_background_color' ";
 			$sql .= "and user_setting_value = '#004200' ";
-			$database = new database;
 			$database->execute($sql, null);
 			unset($sql);
 	}

core/users/app_defaults.php

@@ -31,7 +31,6 @@ if ($domains_processed == 1) {
 		$group->defaults();
 
 	//create the user view combines username, organization, contact first and last name
-		$database = new database;
 		$database->execute("DROP VIEW view_users;", null);
 
 		$sql = "CREATE VIEW view_users AS ( \n";
@@ -80,14 +79,12 @@ if ($domains_processed == 1) {
 		$sql .= "	where 1 = 1 \n";
 		$sql .= "	order by u.username asc \n";
 		$sql .= "); \n";
-		$database = new database;
 		$database->execute($sql, null);
 		unset($sql);
 
 	//find rows that have a null group_uuid and set the correct group_uuid
 		$sql = "select * from v_user_groups ";
 		$sql .= "where group_uuid is null; ";
-		$database = new database;
 		$result = $database->select($sql, null, 'all');
 		if (is_array($result)) {
 			foreach($result as $row) {
@@ -96,7 +93,6 @@ if ($domains_processed == 1) {
 						$sql = "select group_uuid from v_groups ";
 						$sql .= "where group_name = :group_name ";
 						$parameters['group_name'] = $row['group_name'];
-						$database = new database;
 						$group_uuid = $database->execute($sql, $parameters, 'column');
 						unset($sql, $parameters);
 					//set the user_group_uuid
@@ -105,7 +101,6 @@ if ($domains_processed == 1) {
 						$sql .= "where user_group_uuid = :user_group_uuid; ";
 						$parameters['group_uuid'] = $group_uuid;
 						$parameters['user_group_uuid'] = $row['user_group_uuid'];
-						$database = new database;
 						$database->execute($sql, $parameters);
 						unset($sql, $parameters);
 				}
@@ -116,7 +111,6 @@ if ($domains_processed == 1) {
 	//update users email if they are all null
 		$sql = "select count(*) from v_users ";
 		$sql .= "where user_email is not null; ";
-		$database = new database;
 		$num_rows = $database->select($sql, null, 'column');
 		if ($num_rows == 0) {
 			$sql = "with users AS ( ";
@@ -130,14 +124,12 @@ if ($domains_processed == 1) {
 			$sql .= "set user_email = users.email_address ";
 			$sql .= "from users ";
 			$sql .= "where v_users.user_uuid = users.user_uuid;";
-			$database = new database;
 			$database->execute($sql, null);
 		}
 
 	//find rows that have a null group_uuid and set the correct group_uuid
 		$sql = "select count(*) from v_default_settings ";
 		$sql .= "where default_setting_category = 'user'; ";
-		$database = new database;
 		$num_rows = $database->select($sql, null, 'column');
 		if ($num_rows > 0) {
 			//build the array
@@ -171,7 +163,6 @@ if ($domains_processed == 1) {
 			$p->add("default_setting_edit", 'temp');
 
 			//save to the data
-			$database = new database;
 			$database->app_name = 'default_setting';
 			$database->app_uuid = '2c2453c0-1bea-4475-9f44-4d969650de09';
 			$database->save($array, false);
@@ -187,7 +178,6 @@ if ($domains_processed == 1) {
 			//add the email templates to the database
 			$sql = "select count(*) as num_rows from v_email_templates ";
 			$sql .= "where email_template_uuid = '05b529c4-fba7-4071-bab3-143b076392e7' ";
-			$database = new database;
 			$num_rows = $database->select($sql, null, 'column');
 			if ($num_rows == 0) {
 				//build the array
@@ -223,7 +213,6 @@ if ($domains_processed == 1) {
 				$p->add("email_template_edit", 'temp');
 
 				//save to the data
-				$database = new database;
 				$database->app_name = 'email_templates';
 				$database->app_uuid = '8173e738-2523-46d5-8943-13883befd2fd';
 				$database->save($array, false);
@@ -238,13 +227,11 @@ if ($domains_processed == 1) {
 	//update the user_type when the value is null
 		$sql = "select count(*) from v_users ";
 		$sql .= "where user_type is null; ";
-		$database = new database;
 		$num_rows = $database->select($sql, null, 'column');
 		if ($num_rows > 0) {
 			$sql = "update v_users ";
 			$sql .= "set user_type = 'default' ";
 			$sql .= "where user_type is null;";
-			$database = new database;
 			$database->execute($sql, null);
 		}