From 2d320abcb76154145c97f12cbdbadaeba9f9d3bc Mon Sep 17 00:00:00 2001
From: FusionPBX <markjcrane@gmail.com>
Date: Thu, 25 Jul 2019 09:16:20 -0600
Subject: [PATCH] Update app_defaults.php

---
 core/users/app_defaults.php | 35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/core/users/app_defaults.php b/core/users/app_defaults.php
index d3bb7e1074..4be87e6a32 100644
--- a/core/users/app_defaults.php
+++ b/core/users/app_defaults.php
@@ -51,37 +51,36 @@ if ($domains_processed == 1) {
 		$sql .= "	where 1 = 1\n";
 		$sql .= "	order by u.username asc\n";
 		$sql .= ");\n";
-		$db->exec($sql);
+		$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; ";
-		$prep_statement = $db->prepare(check_sql($sql));
-		if ($prep_statement) {
-			$prep_statement->execute();
-			$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
-			$db->beginTransaction();
+		$database = new database;
+		$result = $database->select($sql, null, 'all');
+		if (is_array($result)) {
 			foreach($result as $row) {
 				if (strlen($row['group_name']) > 0) {
 					//get the group_uuid
 						$sql = "select group_uuid from v_groups ";
-						$sql .= "where group_name = '".$row['group_name']."' ";
-						$prep_statement_sub = $db->prepare($sql);
-						$prep_statement_sub->execute();
-						$sub_result = $prep_statement_sub->fetch(PDO::FETCH_ASSOC);
-						unset ($prep_statement_sub);
-						$group_uuid = $sub_result['group_uuid'];
+						$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
 						$sql = "update v_user_groups set ";
-						$sql .= "group_uuid = '".$group_uuid."' ";
-						$sql .= "where user_group_uuid = '".$row['user_group_uuid']."'; ";
-						$db->exec($sql);
-						unset($sql);
+						$sql .= "group_uuid = :group_uuid ";
+						$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);
 				}
 			}
-			$db->commit();
-			unset ($prep_statement);
 		}
 
 	//insert default password reset email template