diff --git a/app/contacts/app_config.php b/app/contacts/app_config.php
index c3294676e5..2c53e9ed50 100644
--- a/app/contacts/app_config.php
+++ b/app/contacts/app_config.php
@@ -5,7 +5,7 @@
 		$apps[$x]['uuid'] = "04481e0e-a478-c559-adad-52bd4174574c";
 		$apps[$x]['category'] = "CRM";
 		$apps[$x]['subcategory'] = "";
-		$apps[$x]['version'] = "1.1";
+		$apps[$x]['version'] = "2.0";
 		$apps[$x]['license'] = "Mozilla Public License 1.1";
 		$apps[$x]['contact_url'] = "http://www.fusionpbx.com";
 		$apps[$x]['description']['en-us'] = "Provides a place to store contact information for individuals and organizations.";
diff --git a/app/contacts/contact_edit.php b/app/contacts/contact_edit.php
index 1fb2746838..59e6fd2cfd 100644
--- a/app/contacts/contact_edit.php
+++ b/app/contacts/contact_edit.php
@@ -17,11 +17,8 @@
 
 	The Initial Developer of the Original Code is
 	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2008-2020
+	Portions created by the Initial Developer are Copyright (C) 2018 - 2021
 	the Initial Developer. All Rights Reserved.
-
-	Contributor(s):
-	Mark J Crane <markjcrane@fusionpbx.com>
 */
 
 //includes
@@ -30,7 +27,7 @@
 	require_once "resources/check_auth.php";
 
 //check permissions
-	if (permission_exists('contact_edit')) {
+	if (permission_exists('contact_add') || permission_exists('contact_edit')) {
 		//access granted
 	}
 	else {
@@ -46,34 +43,14 @@
 	if (is_uuid($_REQUEST["id"])) {
 		$action = "update";
 		$contact_uuid = $_REQUEST["id"];
+		$id = $_REQUEST["id"];
 	}
 	else {
 		$action = "add";
 	}
 
 //get http post variables and set them to php variables
-	if (count($_POST) > 0) {
-
-		//process the http post data by submitted action
-			if ($_POST['action'] != '' && is_uuid($_POST['contact_uuid'])) {
-				$array[0]['checked'] = 'true';
-				$array[0]['uuid'] = $_POST['contact_uuid'];
-
-				switch ($_POST['action']) {
-					case 'delete':
-						if (permission_exists('contact_delete')) {
-							$obj = new contacts;
-							$obj->delete($array);
-
-							header('Location: contacts.php');
-							exit;
-						}
-				}
-			}
-
-		$user_uuid = $_POST["user_uuid"];
-		$group_uuid = $_POST['group_uuid'];
-		$contact_type = $_POST["contact_type"];
+	if (is_array($_POST)) {
 		$contact_organization = $_POST["contact_organization"];
 		$contact_name_prefix = $_POST["contact_name_prefix"];
 		$contact_name_given = $_POST["contact_name_given"];
@@ -81,22 +58,39 @@
 		$contact_name_family = $_POST["contact_name_family"];
 		$contact_name_suffix = $_POST["contact_name_suffix"];
 		$contact_nickname = $_POST["contact_nickname"];
+
+		$contact_type = $_POST["contact_type"];
 		$contact_title = $_POST["contact_title"];
-		$contact_category = $_POST["contact_category"];
 		$contact_role = $_POST["contact_role"];
+		$contact_category = $_POST["contact_category"];
 		$contact_time_zone = $_POST["contact_time_zone"];
 		$contact_note = $_POST["contact_note"];
-		$contact_users_delete = $_POST['contact_users_delete'];
-		$contact_groups_delete = $_POST['contact_groups_delete'];
+
+		$last_mod_date = $_POST["last_mod_date"];
+		$last_mod_user = $_POST["last_mod_user"];
+
+		//$contact_users = $_POST["contact_users"];
+		//$contact_groups = $_POST["contact_groups"];
+		$contact_user_uuid = $_POST["contact_user_uuid"];
+		$contact_group_uuid = $_POST["contact_group_uuid"];
+
+
+		$contact_phones = $_POST["contact_phones"];
+		$contact_addresses = $_POST["contact_addresses"];
+		$contact_emails = $_POST["contact_emails"];
+		$contact_urls = $_POST["contact_urls"];
+		$contact_relations = $_POST["contact_relations"];
+		$contact_settings = $_POST["contact_settings"];
+		$contact_attachments = $_POST["contact_attachments"];
+		$contact_times = $_POST["contact_times"];
+		$contact_notes = $_POST["contact_notes"];
 	}
 
-//process the form data
+//process the user data and save it to the database
 	if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 
-		//set the uuid
-			if ($action == "update") {
-				$contact_uuid = $_POST["contact_uuid"];
-			}
+		//debug info
+			//view_array($_POST, true);
 
 		//validate the token
 			$token = new token;
@@ -106,20 +100,162 @@
 				exit;
 			}
 
+		//process the http post data by submitted action
+			if ($_POST['action'] != '' && strlen($_POST['action']) > 0) {
+
+				//prepare the array(s)
+				$x = 0;
+				foreach ($_POST['contact_users'] as $row) {
+					if (is_uuid($row['contact_uuid']) && $row['checked'] === 'true') {
+						$array['contacts'][$x]['checked'] = $row['checked'];
+						$array['contacts'][$x]['contact_users'][]['contact_user_uuid'] = $row['contact_user_uuid'];
+						$x++;
+					}
+				}
+
+				$x = 0;
+				foreach ($_POST['contact_groups'] as $row) {
+					if (is_uuid($row['contact_uuid']) && $row['checked'] === 'true') {
+						$array['contacts'][$x]['checked'] = $row['checked'];
+						$array['contacts'][$x]['contact_groups'][]['contact_group_uuid'] = $row['contact_group_uuid'];
+						$x++;
+					}
+				}
+
+				$x = 0;
+				foreach ($_POST['contact_phones'] as $row) {
+					if (is_uuid($row['contact_uuid']) && $row['checked'] === 'true') {
+						$array['contacts'][$x]['checked'] = $row['checked'];
+						$array['contacts'][$x]['contact_phones'][]['contact_phone_uuid'] = $row['contact_phone_uuid'];
+						$x++;
+					}
+				}
+
+				$x = 0;
+				foreach ($_POST['contact_addresses'] as $row) {
+					if (is_uuid($row['contact_uuid']) && $row['checked'] === 'true') {
+						$array['contacts'][$x]['checked'] = $row['checked'];
+						$array['contacts'][$x]['contact_addresses'][]['contact_address_uuid'] = $row['contact_address_uuid'];
+						$x++;
+					}
+				}
+
+				$x = 0;
+				foreach ($_POST['contact_emails'] as $row) {
+					if (is_uuid($row['contact_uuid']) && $row['checked'] === 'true') {
+						$array['contacts'][$x]['checked'] = $row['checked'];
+						$array['contacts'][$x]['contact_emails'][]['contact_email_uuid'] = $row['contact_email_uuid'];
+						$x++;
+					}
+				}
+
+				$x = 0;
+				foreach ($_POST['contact_urls'] as $row) {
+					if (is_uuid($row['contact_uuid']) && $row['checked'] === 'true') {
+						$array['contacts'][$x]['checked'] = $row['checked'];
+						$array['contacts'][$x]['contact_urls'][]['contact_url_uuid'] = $row['contact_url_uuid'];
+						$x++;
+					}
+				}
+
+				$x = 0;
+				foreach ($_POST['contact_relations'] as $row) {
+					if (is_uuid($row['contact_uuid']) && $row['checked'] === 'true') {
+						$array['contacts'][$x]['checked'] = $row['checked'];
+						$array['contacts'][$x]['contact_relations'][]['contact_relation_uuid'] = $row['contact_relation_uuid'];
+						$x++;
+					}
+				}
+
+				$x = 0;
+				foreach ($_POST['contact_settings'] as $row) {
+					if (is_uuid($row['contact_uuid']) && $row['checked'] === 'true') {
+						$array['contacts'][$x]['checked'] = $row['checked'];
+						$array['contacts'][$x]['contact_settings'][]['contact_setting_uuid'] = $row['contact_setting_uuid'];
+						$x++;
+					}
+				}
+
+				$x = 0;
+				foreach ($_POST['contact_attachments'] as $row) {
+					if (is_uuid($row['contact_uuid']) && $row['checked'] === 'true') {
+						$array['contacts'][$x]['checked'] = $row['checked'];
+						$array['contacts'][$x]['contact_attachments'][]['contact_attachment_uuid'] = $row['contact_attachment_uuid'];
+						$x++;
+					}
+				}
+
+				$x = 0;
+				foreach ($_POST['contact_times'] as $row) {
+					if (is_uuid($row['contact_uuid']) && $row['checked'] === 'true') {
+						$array['contacts'][$x]['checked'] = $row['checked'];
+						$array['contacts'][$x]['contact_times'][]['contact_time_uuid'] = $row['contact_time_uuid'];
+						$x++;
+					}
+				}
+
+				$x = 0;
+				foreach ($_POST['contact_notes'] as $row) {
+					if (is_uuid($row['contact_uuid']) && $row['checked'] === 'true') {
+						$array['contacts'][$x]['checked'] = $row['checked'];
+						$array['contacts'][$x]['contact_notes'][]['contact_note_uuid'] = $row['contact_note_uuid'];
+						$x++;
+					}
+				}
+
+				//send the array to the database class
+				switch ($_POST['action']) {
+					case 'copy':
+						if (permission_exists('contact_add')) {
+							$obj = new database;
+							$obj->copy($array);
+						}
+						break;
+					case 'delete':
+						if (permission_exists('contact_delete')) {
+							$obj = new database;
+							$obj->delete($array);
+						}
+						break;
+					case 'toggle':
+						if (permission_exists('contact_update')) {
+							$obj = new database;
+							$obj->toggle($array);
+						}
+						break;
+				}
+
+				//redirect the user
+				if (in_array($_POST['action'], array('copy', 'delete', 'toggle'))) {
+					header('Location: contact_edit.php?id='.$id);
+					exit;
+				}
+			}
+
 		//check for all required data
 			$msg = '';
-			//if (strlen($contact_type) == 0) { $msg .= $text['message-required'].$text['label-contact_type']."<br>\n"; }
-			//if (strlen($contact_organization) == 0) { $msg .= $text['message-required'].$text['label-contact_organization']."<br>\n"; }
-			//if (strlen($contact_name_prefix) == 0) { $msg .= $text['message-required'].$text['label-contact_name_prefix']."<br>\n"; }
-			//if (strlen($contact_name_given) == 0) { $msg .= $text['message-required'].$text['label-contact_name_given']."<br>\n"; }
-			//if (strlen($contact_name_middle) == 0) { $msg .= $text['message-required'].$text['label-contact_name_middle']."<br>\n"; }
-			//if (strlen($contact_name_family) == 0) { $msg .= $text['message-required'].$text['label-contact_name_family']."<br>\n"; }
-			//if (strlen($contact_name_suffix) == 0) { $msg .= $text['message-required'].$text['label-contact_name_suffix']."<br>\n"; }
-			//if (strlen($contact_nickname) == 0) { $msg .= $text['message-required'].$text['label-contact_nickname']."<br>\n"; }
-			//if (strlen($contact_title) == 0) { $msg .= $text['message-required'].$text['label-contact_title']."<br>\n"; }
-			//if (strlen($contact_role) == 0) { $msg .= $text['message-required'].$text['label-contact_role']."<br>\n"; }
-			//if (strlen($contact_time_zone) == 0) { $msg .= $text['message-required'].$text['label-contact_time_zone']."<br>\n"; }
-			//if (strlen($contact_note) == 0) { $msg .= $text['message-required'].$text['label-contact_note']."<br>\n"; }
+			if (strlen($contact_type) == 0) { $msg .= $text['message-required']." ".$text['label-contact_type']."<br>\n"; }
+			//if (strlen($contact_title) == 0) { $msg .= $text['message-required']." ".$text['label-contact_title']."<br>\n"; }
+			//if (strlen($contact_role) == 0) { $msg .= $text['message-required']." ".$text['label-contact_role']."<br>\n"; }
+			//if (strlen($contact_category) == 0) { $msg .= $text['message-required']." ".$text['label-contact_category']."<br>\n"; }
+			//if (strlen($contact_organization) == 0) { $msg .= $text['message-required']." ".$text['label-contact_organization']."<br>\n"; }
+			//if (strlen($contact_name_prefix) == 0) { $msg .= $text['message-required']." ".$text['label-contact_name_prefix']."<br>\n"; }
+			//if (strlen($contact_name_given) == 0) { $msg .= $text['message-required']." ".$text['label-contact_name_given']."<br>\n"; }
+			//if (strlen($contact_name_middle) == 0) { $msg .= $text['message-required']." ".$text['label-contact_name_middle']."<br>\n"; }
+			//if (strlen($contact_name_family) == 0) { $msg .= $text['message-required']." ".$text['label-contact_name_family']."<br>\n"; }
+			//if (strlen($contact_name_suffix) == 0) { $msg .= $text['message-required']." ".$text['label-contact_name_suffix']."<br>\n"; }
+			//if (strlen($contact_nickname) == 0) { $msg .= $text['message-required']." ".$text['label-contact_nickname']."<br>\n"; }
+			//if (strlen($contact_time_zone) == 0) { $msg .= $text['message-required']." ".$text['label-contact_time_zone']."<br>\n"; }
+			//if (strlen($last_mod_date) == 0) { $msg .= $text['message-required']." ".$text['label-last_mod_date']."<br>\n"; }
+			//if (strlen($last_mod_user) == 0) { $msg .= $text['message-required']." ".$text['label-last_mod_user']."<br>\n"; }
+			//if (strlen($contact_phones) == 0) { $msg .= $text['message-required']." ".$text['label-contact_phones']."<br>\n"; }
+			//if (strlen($contact_addresses) == 0) { $msg .= $text['message-required']." ".$text['label-contact_addresses']."<br>\n"; }
+			//if (strlen($contact_emails) == 0) { $msg .= $text['message-required']." ".$text['label-contact_emails']."<br>\n"; }
+			//if (strlen($contact_urls) == 0) { $msg .= $text['message-required']." ".$text['label-contact_urls']."<br>\n"; }
+			//if (strlen($contact_settings) == 0) { $msg .= $text['message-required']." ".$text['label-contact_settings']."<br>\n"; }
+			//if (strlen($contact_user_uuid) == 0) { $msg .= $text['message-required']." ".$text['label-contact_user_uuid']."<br>\n"; }
+			//if (strlen($contact_group_uuid) == 0) { $msg .= $text['message-required']." ".$text['label-contact_group_uuid']."<br>\n"; }
+			//if (strlen($contact_note) == 0) { $msg .= $text['message-required']." ".$text['label-contact_note']."<br>\n"; }
 			if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
 				require_once "resources/header.php";
 				require_once "resources/persist_form_var.php";
@@ -133,147 +269,269 @@
 				return;
 			}
 
-		//add or update the database
-			if ($_POST["persistformvar"] != "true") {
+		//add the contact_uuid
+			if (!is_uuid($_POST["contact_uuid"])) {
+				$contact_uuid = uuid();
+			}
 
-				//add the contact
-					if ($action == "add" && permission_exists('contact_add')) {
-						$contact_uuid = uuid();
-						$array['contacts'][0]['contact_uuid'] = $contact_uuid;
+		//prepare the array
+			$array['contacts'][0]['contact_uuid'] = $contact_uuid;
+			$array['contacts'][0]['domain_uuid'] = $_SESSION['domain_uuid'];
+			$array['contacts'][0]['contact_type'] = $contact_type;
+			$array['contacts'][0]['contact_title'] = $contact_title;
+			$array['contacts'][0]['contact_role'] = $contact_role;
+			$array['contacts'][0]['contact_category'] = $contact_category;
+			$array['contacts'][0]['contact_organization'] = $contact_organization;
+			$array['contacts'][0]['contact_name_prefix'] = $contact_name_prefix;
+			$array['contacts'][0]['contact_name_given'] = $contact_name_given;
+			$array['contacts'][0]['contact_name_middle'] = $contact_name_middle;
+			$array['contacts'][0]['contact_name_family'] = $contact_name_family;
+			$array['contacts'][0]['contact_name_suffix'] = $contact_name_suffix;
+			$array['contacts'][0]['contact_nickname'] = $contact_nickname;
+			$array['contacts'][0]['contact_time_zone'] = $contact_time_zone;
+			$array['contacts'][0]['last_mod_date'] = "now()";
+			$array['contacts'][0]['last_mod_user'] = $_SESSION['user_uuid'];
+			$array['contacts'][0]['contact_note'] = $contact_note;
 
-						message::add($text['message-add']);
+			$y = 0;
+			if (isset($contact_user_uuid)) {
+				$array['contacts'][0]['contact_users'][$y]['domain_uuid'] = $_SESSION['domain_uuid'];
+				$array['contacts'][0]['contact_users'][$y]['contact_user_uuid'] = uuid();
+				$array['contacts'][0]['contact_users'][$y]['contact_uuid'] = $contact_uuid;
+				$array['contacts'][0]['contact_users'][$y]['user_uuid'] = $contact_user_uuid;
+				$y++;
+			}
+
+			$y = 0;
+			if (isset($contact_group_uuid)) {
+				$array['contacts'][0]['contact_groups'][$y]['domain_uuid'] = $_SESSION['domain_uuid'];
+				$array['contacts'][0]['contact_groups'][$y]['contact_group_uuid'] = uuid();
+				$array['contacts'][0]['contact_groups'][$y]['contact_uuid'] = $contact_uuid;
+				$array['contacts'][0]['contact_groups'][$y]['group_uuid'] = $contact_group_uuid;
+				$y++;
+			}
+
+			$y = 0;
+			if (is_array($contact_phones)) {
+				foreach ($contact_phones as $row) {
+					if (strlen($row['phone_number']) > 0) {
+						$array['contacts'][0]['contact_phones'][$y]['domain_uuid'] = $_SESSION['domain_uuid'];
+						$array['contacts'][0]['contact_phones'][$y]['contact_uuid'] = $contact_uuid;
+						$array['contacts'][0]['contact_phones'][$y]['contact_phone_uuid'] = $row["contact_phone_uuid"];
+						$array['contacts'][0]['contact_phones'][$y]['phone_label'] = $row["phone_label"];
+						$array['contacts'][0]['contact_phones'][$y]['phone_number'] = $row["phone_number"];
+						$array['contacts'][0]['contact_phones'][$y]['phone_extension'] = $row["phone_extension"];
+						$array['contacts'][0]['contact_phones'][$y]['phone_speed_dial'] = $row["phone_speed_dial"];
+						$array['contacts'][0]['contact_phones'][$y]['phone_type_voice'] = $row["phone_type_voice"];
+						$array['contacts'][0]['contact_phones'][$y]['phone_type_fax'] = $row["phone_type_fax"];
+						$array['contacts'][0]['contact_phones'][$y]['phone_type_video'] = $row["phone_type_video"];
+						$array['contacts'][0]['contact_phones'][$y]['phone_type_text'] = $row["phone_type_text"];
+						$array['contacts'][0]['contact_phones'][$y]['phone_primary'] = $row["phone_primary"];
+						$array['contacts'][0]['contact_phones'][$y]['phone_description'] = $row["phone_description"];
+						$y++;
 					}
+				}
+			}
 
-				//update the contact
-					if ($action == "update") {
-						$array['contacts'][0]['contact_uuid'] = $contact_uuid;
-
-						message::add($text['message-update']);
+			$y = 0;
+			if (is_array($contact_addresses)) {
+				foreach ($contact_addresses as $row) {
+					if (strlen($row['address_street']) > 0) {
+						$array['contacts'][0]['contact_addresses'][$y]['domain_uuid'] = $_SESSION['domain_uuid'];
+						$array['contacts'][0]['contact_addresses'][$y]['contact_uuid'] = $contact_uuid;
+						$array['contacts'][0]['contact_addresses'][$y]['contact_address_uuid'] = $row["contact_address_uuid"];
+						$array['contacts'][0]['contact_addresses'][$y]['address_label'] = $row["address_label"];
+						$array['contacts'][0]['contact_addresses'][$y]['address_type'] = $row["address_type"];
+						$array['contacts'][0]['contact_addresses'][$y]['address_street'] = $row["address_street"];
+						$array['contacts'][0]['contact_addresses'][$y]['address_extended'] = $row["address_extended"];
+						if (permission_exists('address_community')) {
+							$array['contacts'][0]['contact_addresses'][$y]['address_community'] = $row["address_community"];
+						}
+						$array['contacts'][0]['contact_addresses'][$y]['address_locality'] = $row["address_locality"];
+						$array['contacts'][0]['contact_addresses'][$y]['address_region'] = $row["address_region"];
+						$array['contacts'][0]['contact_addresses'][$y]['address_postal_code'] = $row["address_postal_code"];
+						$array['contacts'][0]['contact_addresses'][$y]['address_country'] = $row["address_country"];
+						if (permission_exists('address_latitude')) {
+							$array['contacts'][0]['contact_addresses'][$y]['address_latitude'] = $row["address_latitude"];
+						}
+						if (permission_exists('address_longitude')) {
+							$array['contacts'][0]['contact_addresses'][$y]['address_longitude'] = $row["address_longitude"];
+						}
+						$array['contacts'][0]['contact_addresses'][$y]['address_primary'] = $row["address_primary"];
+						$array['contacts'][0]['contact_addresses'][$y]['address_description'] = $row["address_description"];
+						$y++;
 					}
+				}
+			}
 
-				//create array
-					if (is_array($array) && @sizeof($array) != 0) {
-						$array['contacts'][0]['domain_uuid'] = $_SESSION['domain_uuid'];
-						$array['contacts'][0]['contact_type'] = $contact_type;
-						$array['contacts'][0]['contact_organization'] = $contact_organization;
-						$array['contacts'][0]['contact_name_prefix'] = $contact_name_prefix;
-						$array['contacts'][0]['contact_name_given'] = $contact_name_given;
-						$array['contacts'][0]['contact_name_middle'] = $contact_name_middle;
-						$array['contacts'][0]['contact_name_family'] = $contact_name_family;
-						$array['contacts'][0]['contact_name_suffix'] = $contact_name_suffix;
-						$array['contacts'][0]['contact_nickname'] = $contact_nickname;
-						$array['contacts'][0]['contact_title'] = $contact_title;
-						$array['contacts'][0]['contact_category'] = $contact_category;
-						$array['contacts'][0]['contact_role'] = $contact_role;
-						$array['contacts'][0]['contact_time_zone'] = $contact_time_zone;
-						$array['contacts'][0]['contact_note'] = $contact_note;
-						$array['contacts'][0]['last_mod_date'] = 'now()';
-						$array['contacts'][0]['last_mod_user'] = $_SESSION['username'];
-
-						$p = new permissions;
+			$y = 0;
+			if (is_array($contact_emails)) {
+				foreach ($contact_emails as $row) {
+					if (strlen($row['email_address']) > 0) {
+						$array['contacts'][0]['contact_emails'][$y]['domain_uuid'] = $_SESSION['domain_uuid'];
+						$array['contacts'][0]['contact_emails'][$y]['contact_uuid'] = $contact_uuid;
+						$array['contacts'][0]['contact_emails'][$y]['contact_email_uuid'] = $row["contact_email_uuid"];
+						$array['contacts'][0]['contact_emails'][$y]['email_label'] = $row["email_label"];
+						$array['contacts'][0]['contact_emails'][$y]['email_address'] = $row["email_address"];
+						$array['contacts'][0]['contact_emails'][$y]['email_primary'] = $row["email_primary"];
+						$array['contacts'][0]['contact_emails'][$y]['email_description'] = $row["email_description"];
+						$y++;
 					}
+				}
+				
+			}
 
-				//assign the contact to the user that added the contact
-					if ($action == "add" && !permission_exists('contact_user_add')) {
-						$user_uuid = $_SESSION["user_uuid"];
+			$y = 0;
+			if (is_array($contact_urls)) {
+				foreach ($contact_urls as $row) {
+					if (strlen($row['url_address']) > 0) {
+						$array['contacts'][0]['contact_urls'][$y]['domain_uuid'] = $_SESSION['domain_uuid'];
+						$array['contacts'][0]['contact_urls'][$y]['contact_uuid'] = $contact_uuid;
+						$array['contacts'][0]['contact_urls'][$y]['contact_url_uuid'] = $row["contact_url_uuid"];
+						$array['contacts'][0]['contact_urls'][$y]['url_type'] = $row["url_type"];
+						$array['contacts'][0]['contact_urls'][$y]['url_label'] = $row["url_label"];
+						$array['contacts'][0]['contact_urls'][$y]['url_address'] = $row["url_address"];
+						$array['contacts'][0]['contact_urls'][$y]['url_primary'] = $row["url_primary"];
+						$array['contacts'][0]['contact_urls'][$y]['url_description'] = $row["url_description"];
+						$y++;
 					}
+				}
+			}
 
-				//add user to contact users table
-					if (is_uuid($user_uuid) && (permission_exists('contact_user_add') || $action == "add")) {
-						$contact_user_uuid = uuid();
-						$array['contact_users'][0]['domain_uuid'] = $domain_uuid;
-						$array['contact_users'][0]['contact_user_uuid'] = $contact_user_uuid;
-						$array['contact_users'][0]['contact_uuid'] = $contact_uuid;
-						$array['contact_users'][0]['user_uuid'] = $user_uuid;
-
-						$p->add('contact_user_add', 'temp');
+			$y = 0;
+			if (is_array($contact_relations)) {
+				foreach ($contact_relations as $row) {
+					if (strlen($row['contact_relation_uuid']) > 0) {
+						$array['contacts'][0]['contact_relations'][$y]['domain_uuid'] = $_SESSION['domain_uuid'];
+						$array['contacts'][0]['contact_relations'][$y]['contact_uuid'] = $contact_uuid;
+						$array['contacts'][0]['contact_relations'][$y]['contact_relation_uuid'] = $row["contact_relation_uuid"];
+						$array['contacts'][0]['contact_relations'][$y]['relation_label'] = $row["relation_label"];
+						$array['contacts'][0]['contact_relations'][$y]['relation_contact_uuid'] = $row["relation_contact_uuid"];
+						$y++;
 					}
+				}
+			}
 
-				//assign the contact to the group
-					if (is_uuid($group_uuid) && permission_exists('contact_group_add')) {
-						$contact_group_uuid = uuid();
-						$array['contact_groups'][0]['contact_group_uuid'] = $contact_group_uuid;
-						$array['contact_groups'][0]['domain_uuid'] = $domain_uuid;
-						$array['contact_groups'][0]['contact_uuid'] = $contact_uuid;
-						$array['contact_groups'][0]['group_uuid'] = $group_uuid;
-
-						$p->add('contact_group_add', 'temp');
+			$y = 0;
+			if (is_array($contact_settings)) {
+				foreach ($contact_settings as $row) {
+					if (strlen($row['contact_setting_name']) > 0) {
+						$array['contacts'][0]['contact_settings'][$y]['domain_uuid'] = $_SESSION['domain_uuid'];
+						$array['contacts'][0]['contact_settings'][$y]['contact_uuid'] = $contact_uuid;
+						$array['contacts'][0]['contact_settings'][$y]['contact_setting_uuid'] = $row["contact_setting_uuid"];
+						$array['contacts'][0]['contact_settings'][$y]['contact_setting_category'] = $row["contact_setting_category"];
+						$array['contacts'][0]['contact_settings'][$y]['contact_setting_subcategory'] = $row["contact_setting_subcategory"];
+						$array['contacts'][0]['contact_settings'][$y]['contact_setting_name'] = $row["contact_setting_name"];
+						$array['contacts'][0]['contact_settings'][$y]['contact_setting_value'] = $row["contact_setting_value"];
+						$array['contacts'][0]['contact_settings'][$y]['contact_setting_order'] = $row["contact_setting_order"];
+						$array['contacts'][0]['contact_settings'][$y]['contact_setting_enabled'] = $row["contact_setting_enabled"];
+						$array['contacts'][0]['contact_settings'][$y]['contact_setting_description'] = $row["contact_setting_description"];
+						$y++;
 					}
+				}
+			}
 
-				//execute
-					if (is_array($array) && @sizeof($array) != 0) {
-						$database = new database;
-						$database->app_name = 'contacts';
-						$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
-						$database->save($array);
-						unset($array);
-
-						$p->delete('contact_user_add', 'temp');
-						$p->delete('contact_group_add', 'temp');
+			$y = 0;
+			if (is_array($contact_attachments)) {
+				foreach ($contact_attachments as $row) {
+					if (strlen($row['attachment_description']) > 0) {
+						$array['contacts'][0]['contact_attachments'][$y]['contact_attachment_uuid'] = $row["contact_attachment_uuid"];
+						$array['contacts'][0]['contact_attachments'][$y]['domain_uuid'] = $row["domain_uuid"];
+						$array['contacts'][0]['contact_attachments'][$y]['contact_uuid'] = $row["contact_uuid"];
+						$array['contacts'][0]['contact_attachments'][$y]['attachment_primary'] = $row["attachment_primary"];
+						//$array['contacts'][0]['contact_attachments'][$y]['attachment_filename'] = $row["attachment_filename"];
+						//$array['contacts'][0]['contact_attachments'][$y]['attachment_content'] = $row["attachment_content"];
+						$array['contacts'][0]['contact_attachments'][$y]['attachment_description'] = $row["attachment_description"];
+						//$array['contacts'][0]['contact_attachments'][$y]['attachment_uploaded_date'] = $row["attachment_uploaded_date"];
+						//$array['contacts'][0]['contact_attachments'][$y]['attachment_uploaded_user_uuid'] = $row["attachment_uploaded_user_uuid"];
+						//$array['contacts'][0]['contact_attachments'][$y]['attachment_size'] = $row["attachment_size"];
+						$y++;
 					}
+				}
+			}
 
-				//delete checked contact properties
-					$array = array();
-					if (permission_exists('contact_phone_delete')) { $contact_properties['contact_phones'] = $_POST['contact_phones']; }
-					if (permission_exists('contact_address_delete')) { $contact_properties['contact_addresses'] = $_POST['contact_addresses']; }
-					if (permission_exists('contact_email_delete')) { $contact_properties['contact_emails'] = $_POST['contact_emails']; }
-					if (permission_exists('contact_url_delete')) { $contact_properties['contact_urls'] = $_POST['contact_urls']; }
-					//if (permission_exists('contact_extension_delete')) { $contact_properties['contact_extensions'] = $_POST['contact_extensions']; }
-					if (permission_exists('contact_relation_delete')) { $contact_properties['contact_relations'] = $_POST['contact_relations']; }
-					if (permission_exists('contact_note_delete')) { $contact_properties['contact_notes'] = $_POST['contact_notes']; }
-					if (permission_exists('contact_time_delete')) { $contact_properties['contact_times'] = $_POST['contact_times']; }
-					if (permission_exists('contact_setting_delete')) { $contact_properties['contact_settings'] = $_POST['contact_settings']; }
-					if (permission_exists('contact_attachment_delete')) { $contact_properties['contact_attachments'] = $_POST['contact_attachments']; }
-
-					if (@sizeof($contact_properties) != 0) {
-						$obj = new contacts;
-						$obj->contact_uuid = $contact_uuid;
-						$obj->delete_properties($contact_properties);
+			$y = 0;
+			if (is_array($contact_times)) {
+				foreach ($contact_times as $row) {
+					if (strlen($row['time_start']) > 0) {
+						$array['contacts'][0]['contact_times'][$y]['contact_time_uuid'] = $row["contact_time_uuid"];
+						$array['contacts'][0]['contact_times'][$y]['domain_uuid'] = $row["domain_uuid"];
+						$array['contacts'][0]['contact_times'][$y]['contact_uuid'] = $row["contact_uuid"];
+						$array['contacts'][0]['contact_times'][$y]['time_start'] = $row["time_start"];
+						$array['contacts'][0]['contact_times'][$y]['time_stop'] = $row["time_stop"];
+						$array['contacts'][0]['contact_times'][$y]['time_description'] = $row["time_description"];
+						$y++;
 					}
+				}
+			}
 
-				//remove checked users
-					if (
-						$action == 'update'
-						&& permission_exists('contact_user_delete')
-						&& is_array($contact_users_delete)
-						&& @sizeof($contact_users_delete) != 0
-						) {
-						$obj = new contacts;
-						$obj->contact_uuid = $contact_uuid;
-						$obj->delete_users($contact_users_delete);
+			$y = 0;
+			if (is_array($contact_notes)) {
+				foreach ($contact_notes as $row) {
+					if (strlen($row['contact_note']) > 0) {
+						$array['contacts'][0]['contact_notes'][$y]['contact_note_uuid'] = $row["contact_note_uuid"];
+						$array['contacts'][0]['contact_notes'][$y]['domain_uuid'] = $row["domain_uuid"];
+						$array['contacts'][0]['contact_notes'][$y]['contact_uuid'] = $row["contact_uuid"];
+						$array['contacts'][0]['contact_notes'][$y]['contact_note'] = $row["contact_note"];
+						$array['contacts'][0]['contact_notes'][$y]['last_mod_date'] = 'now()';
+						$array['contacts'][0]['contact_notes'][$y]['last_mod_user'] = $_SESSION['username'];
+						$y++;
 					}
+				}
+			}
 
-				//remove checked groups
-					if (
-						$action == 'update'
-						&& permission_exists('contact_group_delete')
-						&& is_array($contact_groups_delete)
-						&& @sizeof($contact_groups_delete) != 0
-						) {
-						$obj = new contacts;
-						$obj->contact_uuid = $contact_uuid;
-						$obj->delete_groups($contact_groups_delete);
-					}
+		//save the data
+			if (is_array($array) && @sizeof($array) != 0) {
+				//add the permission object
+				$p = new permissions;
+				$p->add('contact_add', 'temp');
+				$p->add('contact_phone_add', 'temp');
+				$p->add('contact_address_add', 'temp');
+				$p->add('contact_user_add', 'temp');
+				$p->add('contact_group_add', 'temp');
 
-				//redirect the browser
-					header("Location: contact_edit.php?id=".urlencode($contact_uuid));
-					exit;
+				//view_array($array);
 
+				$database = new database;
+				$database->app_name = 'contacts';
+				$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
+				$database->save($array);
+				$message = $database->message;
+				unset($array);
+
+				//view_array($message);
+
+				$p->delete('contact_add', 'temp');
+				$p->delete('contact_phone_add', 'temp');
+				$p->delete('contact_address_add', 'temp');
+				$p->delete('contact_user_add', 'temp');
+				$p->delete('contact_group_add', 'temp');
+			}
+
+		//redirect the user
+			if (isset($action)) {
+				if ($action == "add") {
+					$_SESSION["message"] = $text['message-add'];
+				}
+				if ($action == "update") {
+					$_SESSION["message"] = $text['message-update'];
+				}
+				//header('Location: contacts.php');
+				header('Location: contact_edit.php?id='.urlencode($contact_uuid));
+				return;
 			}
 	}
 
 //pre-populate the form
-	if (count($_GET) > 0 && $_POST["persistformvar"] != "true") {
-		$contact_uuid = $_GET["id"];
+	if (is_array($_GET) && $_POST["persistformvar"] != "true") {
 		$sql = "select * from v_contacts ";
-		$sql .= "where domain_uuid = :domain_uuid ";
-		$sql .= "and contact_uuid = :contact_uuid ";
-		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+		$sql .= "where contact_uuid = :contact_uuid ";
+		//$sql .= "and domain_uuid = :domain_uuid ";
+		//$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 		$parameters['contact_uuid'] = $contact_uuid;
 		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');
 		if (is_array($row) && @sizeof($row) != 0) {
-			$contact_type = $row["contact_type"];
 			$contact_organization = $row["contact_organization"];
 			$contact_name_prefix = $row["contact_name_prefix"];
 			$contact_name_given = $row["contact_name_given"];
@@ -281,11 +539,27 @@
 			$contact_name_family = $row["contact_name_family"];
 			$contact_name_suffix = $row["contact_name_suffix"];
 			$contact_nickname = $row["contact_nickname"];
+
+			$contact_type = $row["contact_type"];
 			$contact_title = $row["contact_title"];
-			$contact_category = $row["contact_category"];
 			$contact_role = $row["contact_role"];
+			$contact_category = $row["contact_category"];
 			$contact_time_zone = $row["contact_time_zone"];
 			$contact_note = $row["contact_note"];
+
+			$last_mod_date = $row["last_mod_date"];
+			$last_mod_user = $row["last_mod_user"];
+
+			//$contact_phones = $row["contact_phones"];
+			//$contact_addresses = $row["contact_addresses"];
+			//$contact_emails = $row["contact_emails"];
+			//$contact_urls = $row["contact_urls"];
+			//$contact_settings = $row["contact_settings"];
+			//$contact_user_uuid = $row["contact_user_uuid"];
+
+			$contact_user_uuid = $row["contact_user_uuid"];
+			$contact_group_uuid = $row["contact_group_uuid"];
+
 		}
 		unset($sql, $parameters, $row);
 	}
@@ -310,37 +584,42 @@
 	}
 
 //get the users assigned to this contact
-	$sql = "select u.username, u.user_uuid, a.contact_user_uuid from v_contacts as c, v_users as u, v_contact_users as a ";
-	$sql .= "where c.contact_uuid = :contact_uuid ";
-	$sql .= "and c.domain_uuid = :domain_uuid ";
-	$sql .= "and u.user_uuid = a.user_uuid ";
-	$sql .= "and c.contact_uuid = a.contact_uuid ";
-	$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);
+	if (is_uuid($contact_uuid)) {
+		$sql = "select c.domain_uuid, c.contact_uuid, u.username, u.user_uuid, a.contact_user_uuid ";
+		$sql .= "from v_contacts as c, v_users as u, v_contact_users as a ";
+		$sql .= "where c.contact_uuid = :contact_uuid ";
+		$sql .= "and c.domain_uuid = :domain_uuid ";
+		$sql .= "and u.user_uuid = a.user_uuid ";
+		$sql .= "and c.contact_uuid = a.contact_uuid ";
+		$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);
+	}
 
 //get the assigned groups of this contact
-	$sql = "select g.*, cg.contact_group_uuid ";
-	$sql .= "from v_groups as g, v_contact_groups as cg ";
-	$sql .= "where cg.group_uuid = g.group_uuid ";
-	$sql .= "and cg.domain_uuid = :domain_uuid ";
-	$sql .= "and cg.contact_uuid = :contact_uuid ";
-	$sql .= "and cg.group_uuid <> :group_uuid ";
-	$sql .= "order by g.group_name asc ";
-	$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 (is_array($contact_groups_assigned) && @sizeof($contact_groups_assigned) != 0) {
-		foreach ($contact_groups_assigned as $field) {
-			$contact_groups[] = "'".$field['group_uuid']."'";
+	if (is_uuid($contact_uuid)) {
+		$sql = "select g.*, cg.contact_group_uuid ";
+		$sql .= "from v_groups as g, v_contact_groups as cg ";
+		$sql .= "where cg.group_uuid = g.group_uuid ";
+		$sql .= "and cg.domain_uuid = :domain_uuid ";
+		$sql .= "and cg.contact_uuid = :contact_uuid ";
+		$sql .= "and cg.group_uuid <> :group_uuid ";
+		$sql .= "order by g.group_name asc ";
+		$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 (is_array($contact_groups_assigned) && @sizeof($contact_groups_assigned) != 0) {
+			foreach ($contact_groups_assigned as $field) {
+				$contact_groups[] = "'".$field['group_uuid']."'";
+			}
 		}
+		unset($sql, $parameters);
 	}
-	unset($sql, $parameters);
 
 //get the available groups to this contact
 	$sql = "select group_uuid, group_name from v_groups ";
@@ -354,19 +633,265 @@
 	$contact_groups_available = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters, $contact_groups);
 
+//get the child data
+	if (is_uuid($contact_uuid)) {
+		$sql = "select * from v_contact_phones ";
+		$sql .= "where contact_uuid = :contact_uuid ";
+		//$sql .= "and domain_uuid = '".$domain_uuid."' ";
+		//$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+		$parameters['contact_uuid'] = $contact_uuid;
+		$database = new database;
+		$contact_phones = $database->select($sql, $parameters, 'all');
+		unset ($sql, $parameters);
+	}
+
+//add the $contact_phone_uuid
+	if (!is_uuid($contact_phone_uuid)) {
+		$contact_phone_uuid = uuid();
+	}
+
+//add an empty row
+	if (!is_array($contact_phones) || count($contact_phones) == 0) {
+		$x = is_array($contact_phones) ? count($contact_phones) : 0;
+		$contact_phones[$x]['domain_uuid'] = $_SESSION['domain_uuid'];
+		$contact_phones[$x]['contact_uuid'] = $contact_uuid;
+		$contact_phones[$x]['contact_phone_uuid'] = uuid();
+		$contact_phones[$x]['phone_label'] = '';
+		$contact_phones[$x]['phone_number'] = '';
+		$contact_phones[$x]['phone_extension'] = '';
+		$contact_phones[$x]['phone_speed_dial'] = '';
+		$contact_phones[$x]['phone_type_voice'] = '';
+		$contact_phones[$x]['phone_type_fax'] = '';
+		$contact_phones[$x]['phone_type_video'] = '';
+		$contact_phones[$x]['phone_type_text'] = '';
+		$contact_phones[$x]['phone_primary'] = '';
+		$contact_phones[$x]['phone_description'] = '';
+	}
+
+//get the child data
+	if (is_uuid($contact_uuid)) {
+		$sql = "select * from v_contact_addresses ";
+		$sql .= "where contact_uuid = :contact_uuid ";
+		//$sql .= "and domain_uuid = '".$domain_uuid."' ";
+		$sql .= "order by address_street 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);
+	}
+
+//add the $contact_address_uuid
+	if (!is_uuid($contact_address_uuid)) {
+		$contact_address_uuid = uuid();
+	}
+
+//add an empty row
+	if (!is_array($contact_addresses) || count($contact_addresses) == 0) {
+		$x = is_array($contact_addresses) ? count($contact_addresses) : 0;
+		$contact_addresses[$x]['domain_uuid'] = $_SESSION['domain_uuid'];
+		$contact_addresses[$x]['contact_uuid'] = $contact_uuid;
+		$contact_addresses[$x]['contact_address_uuid'] = uuid();
+		$contact_addresses[$x]['address_label'] = '';
+		$contact_addresses[$x]['address_type'] = '';
+		$contact_addresses[$x]['address_street'] = '';
+		$contact_addresses[$x]['address_extended'] = '';
+		$contact_addresses[$x]['address_community'] = '';
+		$contact_addresses[$x]['address_locality'] = '';
+		$contact_addresses[$x]['address_region'] = '';
+		$contact_addresses[$x]['address_postal_code'] = '';
+		$contact_addresses[$x]['address_country'] = '';
+		$contact_addresses[$x]['address_latitude'] = '';
+		$contact_addresses[$x]['address_longitude'] = '';
+		$contact_addresses[$x]['address_primary'] = '';
+		$contact_addresses[$x]['address_description'] = '';
+	}
+
+//get the child data
+	if (is_uuid($contact_uuid)) {
+		$sql = "select * from v_contact_emails ";
+		$sql .= "where contact_uuid = :contact_uuid ";
+		//$sql .= "and domain_uuid = '".$domain_uuid."' ";
+		//$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+		$parameters['contact_uuid'] = $contact_uuid;
+		$database = new database;
+		$contact_emails = $database->select($sql, $parameters, 'all');
+		unset ($sql, $parameters);
+	}
+
+//add the $contact_email_uuid
+	if (!is_uuid($contact_email_uuid)) {
+		$contact_email_uuid = uuid();
+	}
+
+//add an empty row
+	if (!is_array($contact_emails) || count($contact_emails) == 0) {
+		$x = is_array($contact_emails) ? count($contact_emails) : 0;
+		$contact_emails[$x]['domain_uuid'] = $_SESSION['domain_uuid'];
+		$contact_emails[$x]['contact_uuid'] = $contact_uuid;
+		$contact_emails[$x]['contact_email_uuid'] = uuid();
+		$contact_emails[$x]['email_label'] = '';
+		$contact_emails[$x]['email_address'] = '';
+		$contact_emails[$x]['email_primary'] = '';
+		$contact_emails[$x]['email_description'] = '';
+	}
+
+//get the child data
+	if (is_uuid($contact_uuid)) {
+		$sql = "select * from v_contact_urls ";
+		$sql .= "where contact_uuid = :contact_uuid ";
+		//$sql .= "and domain_uuid = '".$domain_uuid."' ";
+		$sql .= "order by url_address 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);
+	}
+
+//add the $contact_url_uuid
+	if (!is_uuid($contact_url_uuid)) {
+		$contact_url_uuid = uuid();
+	}
+
+//add an empty row
+	if (!is_array($contact_urls) || count($contact_urls) == 0) {
+		$x = is_array($contact_urls) ? count($contact_urls) : 0;
+		$contact_urls[$x]['domain_uuid'] = $_SESSION['domain_uuid'];
+		$contact_urls[$x]['contact_uuid'] = $contact_uuid;
+		$contact_urls[$x]['contact_url_uuid'] = uuid();
+		$contact_urls[$x]['url_type'] = '';
+		$contact_urls[$x]['url_label'] = '';
+		$contact_urls[$x]['url_address'] = '';
+		$contact_urls[$x]['url_primary'] = '';
+		$contact_urls[$x]['url_description'] = '';
+	}
+
+//get the child data
+	if (is_uuid($contact_uuid)) {
+		$sql = "select * from v_contact_relations ";
+		$sql .= "where contact_uuid = :contact_uuid ";
+		//$sql .= "and domain_uuid = '".$domain_uuid."' ";
+		//$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+		$parameters['contact_uuid'] = $contact_uuid;
+		$database = new database;
+		$contact_relations = $database->select($sql, $parameters, 'all');
+		unset ($sql, $parameters);
+	}
+
+//add the $contact_setting_uuid
+	if (!is_uuid($contact_relation_uuid)) {
+		$contact_relation_uuid = uuid();
+	}
+
+//add an empty row
+	if (!is_array($contact_relations) || count($contact_relations) == 0) {
+		$x = is_array($contact_relations) ? count($contact_relations) : 0;
+		$contact_relations[$x]['domain_uuid'] = $_SESSION['domain_uuid'];
+		$contact_relations[$x]['contact_uuid'] = $contact_uuid;
+		$contact_relations[$x]['contact_relation_uuid'] = uuid();
+		$contact_relations[$x]['relation_label'] = '';
+		$contact_relations[$x]['relation_contact_uuid'] = '';
+	}
+
+//get the child data
+	if (is_uuid($contact_uuid)) {
+		$sql = "select * from v_contact_settings ";
+		$sql .= "where contact_uuid = :contact_uuid ";
+		//$sql .= "and domain_uuid = '".$domain_uuid."' ";
+		//$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+		$parameters['contact_uuid'] = $contact_uuid;
+		$database = new database;
+		$contact_settings = $database->select($sql, $parameters, 'all');
+		unset ($sql, $parameters);
+	}
+
+//add the $contact_setting_uuid
+	if (!is_uuid($contact_setting_uuid)) {
+		$contact_setting_uuid = uuid();
+	}
+
+//add an empty row
+	if (!is_array($contact_settings) || count($contact_settings) == 0) {
+		$x = is_array($contact_settings) ? count($contact_settings) : 0;
+		$contact_settings[$x]['domain_uuid'] = $_SESSION['domain_uuid'];
+		$contact_settings[$x]['contact_uuid'] = $contact_uuid;
+		$contact_settings[$x]['contact_setting_uuid'] = uuid();
+		$contact_settings[$x]['contact_setting_category'] = '';
+		$contact_settings[$x]['contact_setting_subcategory'] = '';
+		$contact_settings[$x]['contact_setting_name'] = '';
+		$contact_settings[$x]['contact_setting_value'] = '';
+		$contact_settings[$x]['contact_setting_order'] = '';
+		$contact_settings[$x]['contact_setting_enabled'] = '';
+		$contact_settings[$x]['contact_setting_description'] = '';
+	}
+
+//get the contact attachments
+	if (is_uuid($contact_uuid)) {
+		$sql = "select *, length(decode(attachment_content,'base64')) as attachment_size from v_contact_attachments ";
+		$sql .= "where domain_uuid = :domain_uuid ";
+		$sql .= "and contact_uuid = :contact_uuid ";
+		$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);
+	}
+
+//get the child data
+	if (is_uuid($contact_uuid)) {
+		$sql = "select * from v_contact_times ";
+		$sql .= "where contact_uuid = :contact_uuid ";
+		//$sql .= "and domain_uuid = '".$domain_uuid."' ";
+		//$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+		$parameters['contact_uuid'] = $contact_uuid;
+		$database = new database;
+		$contact_times = $database->select($sql, $parameters, 'all');
+		unset ($sql, $parameters);
+	}
+
+//add the $contact_time_uuid
+	if (!is_uuid($contact_time_uuid)) {
+		$contact_time_uuid = uuid();
+	}
+
+//add an empty row
+	if (!is_array($contact_times)) {
+		$x = is_array($contact_times) ? count($contact_times) : 0;
+		$contact_times[$x]['domain_uuid'] = $_SESSION['domain_uuid'];
+		$contact_times[$x]['contact_uuid'] = $contact_uuid;
+		$contact_times[$x]['contact_time_uuid'] = uuid();
+	}
+
+//get the contact notes
+	$sql = "select * from v_contact_notes ";
+	$sql .= "where domain_uuid = :domain_uuid ";
+	$sql .= "and contact_uuid = :contact_uuid ";
+	$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);
+
+//add an empty row
+	if (!is_array($contact_times)) {
+		$x = is_array($contact_times) ? count($contact_times) : 0;
+		$contact_times[$x]['domain_uuid'] = $_SESSION['domain_uuid'];
+		$contact_times[$x]['contact_uuid'] = $contact_uuid;
+		$contact_times[$x]['contact_time_uuid'] = uuid();
+	}
+
 //create token
 	$object = new token;
 	$token = $object->create($_SERVER['PHP_SELF']);
 
 //show the header
-	if ($action == "update") {
-		$document['title'] = $text['title-contact-edit'];
-	}
-	else if ($action == "add") {
-		$document['title'] = $text['title-contact-add'];
-	}
+	$document['title'] = $text['title-contact-edit'];
 	require_once "resources/header.php";
 
+
 //determine qr branding
 	if ($_SESSION['theme']['qr_brand_type']['text'] == 'image' && $_SESSION['theme']['qr_brand_image']['text'] != '') {
 		echo "<img id='img-buffer' style='display: none;' src='".$_SESSION["theme"]["qr_brand_image"]["text"]."'>";
@@ -434,20 +959,24 @@
 	echo "</script>";
 
 //show the content
-	echo "<form name='frm' id='frm' method='post'>\n";
+	echo "<form name='frm' id='frm' method='post' action=''>\n";
+	echo "<input class='formfld' type='hidden' name='contact_uuid' value='".escape($contact_uuid)."'>\n";
 
 	echo "<div class='action_bar' id='action_bar'>\n";
-	echo "	<div class='heading'>";
-	if ($action == "add") {
-		echo "<b>".$text['header-contact-add']."</b>";
-	}
-	else if ($action == "update") {
-		echo "<b>".$text['header-contact-edit']."</b>";
-	}
-	echo "	</div>\n";
+	echo "	<div class='heading'><b>".$text['title-contact-edit']."</b></div>\n";
 	echo "	<div class='actions'>\n";
-	echo button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>$_SESSION['theme']['button_icon_back'],'id'=>'btn_back','collapse'=>'hide-sm-dn','style'=>'margin-right: 15px;','link'=>'contacts.php']);
-	if ($action == "update") {
+	echo button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>$_SESSION['theme']['button_icon_back'],'id'=>'btn_back','collapse'=>'hide-xs','style'=>'margin-right: 15px;','link'=>'contacts.php']);
+	if ($action == 'update') {
+		if (permission_exists('contact_phone_add')) {
+			echo button::create(['type'=>'button','label'=>$text['button-copy'],'icon'=>$_SESSION['theme']['button_icon_copy'],'id'=>'btn_copy','name'=>'btn_copy','style'=>'display: none;','onclick'=>"modal_open('modal-copy','btn_copy');"]);
+		}
+		if (permission_exists('contact_phone_delete')) {
+			echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'id'=>'btn_delete','name'=>'btn_delete','style'=>'display: none; margin-right: 15px;','onclick'=>"modal_open('modal-delete','btn_delete');"]);
+		}
+	}
+
+	//add edit
+	if (isset($id)) {
 		if (permission_exists('contact_time_add')) {
 			//detect timer state (and start time)
 			$sql = "select ";
@@ -467,16 +996,17 @@
 			unset($sql, $parameters);
 			echo button::create(['type'=>'button','label'=>$text['button-timer'],'icon'=>'clock','style'=>$btn_style,'title'=>$time_start,'collapse'=>'hide-sm-dn','onclick'=>"window.open('contact_timer.php?domain_uuid=".urlencode($domain_uuid)."&contact_uuid=".urlencode($contact_uuid)."','contact_time_".escape($contact_uuid)."','width=300, height=375, top=30, left='+(screen.width - 350)+', menubar=no, scrollbars=no, status=no, toolbar=no, resizable=no');"]);
 		}
+
 		echo button::create(['type'=>'button','label'=>$text['button-qr_code'],'icon'=>'qrcode','collapse'=>'hide-sm-dn','onclick'=>"$('#qr_code_container').fadeIn(400);"]);
 		echo button::create(['type'=>'button','label'=>$text['button-vcard'],'icon'=>'address-card','collapse'=>'hide-sm-dn','link'=>'contacts_vcard.php?id='.urlencode($contact_uuid).'&type=download']);
 	}
-	if ($action == "update" && is_dir($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/app/invoices')) {
-		echo button::create(['type'=>'button','label'=>$text['button-invoices'],'icon'=>'file-invoice-dollar','collapse'=>'hide-sm-dn','link'=>'../invoices/invoices.php?id='.urlencode($contact_uuid)]);
-	}
-	if ($action == "update" && is_dir($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/app/certificates')) {
-		echo button::create(['type'=>'button','label'=>$text['button-certificate'],'icon'=>'certificate','collapse'=>'hide-sm-dn','link'=>'../certificates/index.php?name='.urlencode($contact_name_given." ".$contact_name_family)]);
-	}
-	if ($action == "update" && permission_exists('user_edit') && is_uuid($contact_user_uuid)) {
+	//add edit
+	//if (isset($id)) {
+		//echo button::create(['type'=>'button','label'=>$text['button-notes'],'icon'=>'','collapse'=>'hide-xs','style'=>'margin-right: 0px;','link'=>"contact_notes.php?id=$id"]);
+	//}
+
+	//add user
+	if (isset($id) && permission_exists('user_edit')) {
 		echo button::create(['type'=>'button','label'=>$text['button-user'],'icon'=>'user','collapse'=>'hide-sm-dn','link'=>'../../core/users/user_edit.php?id='.urlencode($contact_user_uuid)]);
 	}
 	if (
@@ -521,388 +1051,1510 @@
 		)) {
 		echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'name'=>'btn_delete','collapse'=>'hide-sm-dn','onclick'=>"modal_open('modal-delete','btn_delete');"]);
 	}
-	if (permission_exists('contact_add')) {
-		echo button::create(['type'=>'button','label'=>$text['button-save'],'icon'=>$_SESSION['theme']['button_icon_save'],'id'=>'btn_save','style'=>($action != 'update' ?: 'margin-left: 15px;'),'collapse'=>'hide-sm-dn','onclick'=>"document.getElementById('frm').submit();"]);
-	}
+	echo button::create(['type'=>'submit','label'=>$text['button-save'],'icon'=>$_SESSION['theme']['button_icon_save'],'style'=>'margin-left: 15px;','id'=>'btn_save','collapse'=>'hide-xs']);
 	echo "	</div>\n";
 	echo "	<div style='clear: both;'></div>\n";
 	echo "</div>\n";
 
-	if (
-		$action == "update" && (
-		permission_exists('contact_delete') ||
-		permission_exists('contact_user_delete') ||
-		permission_exists('contact_group_delete') ||
-		permission_exists('contact_phone_delete') ||
-		permission_exists('contact_address_delete') ||
-		permission_exists('contact_email_delete') ||
-		permission_exists('contact_url_delete') ||
-		permission_exists('contact_relation_delete') ||
-		permission_exists('contact_note_delete') ||
-		permission_exists('contact_time_delete') ||
-		permission_exists('contact_setting_delete') ||
-		permission_exists('contact_attachment_delete')
-		)) {
-		echo modal::create(['id'=>'modal-delete','type'=>'delete','actions'=>button::create(['type'=>'submit','label'=>$text['button-continue'],'icon'=>'check','id'=>'btn_delete','style'=>'float: right; margin-left: 15px;','collapse'=>'never','name'=>'action','value'=>'delete','onclick'=>"modal_close();"])]);
-	}
-
-	if ($action == "add") {
-		echo $text['description-contact-add']."\n";
-	}
-	else if ($action == "update") {
-		echo $text['description-contact-edit']."\n";
-	}
+	echo $text['description-contact-edit']."\n";
 	echo "<br /><br />\n";
 
-	echo "<table border='0' cellpadding='0' cellspacing='0' width='100%'>\n";
-	echo "<tr>\n";
-	echo "<td valign='top' align='left' nowrap='nowrap'>\n";
+	if ($action == 'update') {
+		if (permission_exists('contact_add')) {
+			echo modal::create(['id'=>'modal-copy','type'=>'copy','actions'=>button::create(['type'=>'submit','label'=>$text['button-continue'],'icon'=>'check','id'=>'btn_copy','style'=>'float: right; margin-left: 15px;','collapse'=>'never','name'=>'action','value'=>'copy','onclick'=>"modal_close();"])]);
+		}
+		if (permission_exists('contact_delete')) {
+			echo modal::create(['id'=>'modal-delete','type'=>'delete','actions'=>button::create(['type'=>'submit','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'id'=>'btn_delete','style'=>'float: right; margin-left: 15px;','collapse'=>'never','name'=>'action','value'=>'delete','onclick'=>"modal_close();"])]);
+		}
+	}
 
-		echo "<table border='0' cellpadding='0' cellspacing='0' width='100%'>\n";
-		echo "<tr>\n";
-		echo "<td width='30%' class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
-		echo "	".$text['label-contact_type']."\n";
-		echo "</td>\n";
-		echo "<td width='70%' class='vtable' align='left'>\n";
-		if (is_array($_SESSION["contact"]["type"])) {
-			sort($_SESSION["contact"]["type"]);
-			echo "	<select class='formfld' name='contact_type'>\n";
-			echo "		<option value=''></option>\n";
-			foreach($_SESSION["contact"]["type"] as $type) {
-				echo "	<option value='".escape($type)."' ".(($type == $contact_type) ? "selected='selected'" : null).">".escape($type)."</option>\n";
-			}
-			echo "	</select>\n";
+?>
+
+<style>
+* {
+  box-sizing: border-box;
+}
+
+input[type=text], select, textarea {
+  width: 100%;
+  padding: 12px;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  resize: vertical;
+}
+
+label {
+  padding: 12px 12px 12px 0;
+  display: inline-block;
+}
+
+input[type=submit] {
+  background-color: #4CAF50;
+  color: white;
+  padding: 12px 20px;
+  border: none;
+  border-radius: 100px;
+  cursor: pointer;
+  float: right;
+}
+
+input[type=submit]:hover {
+  background-color: #45a049;
+}
+
+option:first-child {
+  color: #ccc;
+}
+
+.container {
+  border-radius: 5px;
+  background-color: #f2f2f2;
+  padding: 20px;
+}
+
+.col-25 {
+  float: left;
+  width: 25%;
+  margin-top: 6px;
+}
+
+.col-75 {
+  float: left;
+  width: 75%;
+  margin-top: 6px;
+}
+
+/* Clear floats after the columns */
+.row:after {
+  content: "";
+  display: table;
+  clear: both;
+}
+
+.form_set {
+  padding: 10px;
+}
+
+/* Responsive layout - when the screen is less than 600px wide, make the two columns stack on top of each other instead of next to each other */
+@media screen and (max-width: 600px) {
+  .col-25, .col-75, input[type=submit] {
+    width: 100%;
+    margin-top: 0;
+  }
+}
+
+@media screen and (max-width: 941px) {
+  .empty_row {
+	display: none;
+  }
+}
+</style>
+
+<?php
+
+echo "<div class='form_grid'>\n";
+
+echo "	<div class='form_set'>\n";
+echo "		<div class='heading'>\n";
+echo "			<b>".$text['label-name']."</b>\n";
+echo "		</div>\n";
+echo "		<div style='clear: both;'></div>\n";
+
+echo "		<div class='label'>\n";
+echo "			".$text['label-contact_organization']."\n";
+echo "		</div>\n";
+echo "		<div class='field no-wrap'>\n";
+echo "				<input class='formfld' type='text' name='contact_organization' placeholder='' maxlength='255' value='".escape($contact_organization)."'>\n";
+echo "		</div>\n";
+
+echo "		<div class='label'>\n";
+echo "			".$text['label-contact_name_prefix']."\n";
+echo "		</div>\n";
+echo "		<div class='field no-wrap'>\n";
+echo "				<input class='formfld' type='text' name='contact_name_prefix' placeholder='' maxlength='255' value='".escape($contact_name_prefix)."'>\n";
+echo "		</div>\n";
+
+echo "		<div class='label'>\n";
+echo "			".$text['label-contact_name_given']."\n";
+echo "		</div>\n";
+echo "		<div class='field no-wrap'>\n";
+echo "				<input class='formfld' type='text' name='contact_name_given' placeholder='' maxlength='255' value='".escape($contact_name_given)."'>\n";
+echo "		</div>\n";
+
+echo "		<div class='label'>\n";
+echo "			".$text['label-contact_name_middle']."\n";
+echo "		</div>\n";
+echo "		<div class='field no-wrap'>\n";
+echo "				<input class='formfld' type='text' name='contact_name_middle' placeholder='' maxlength='255' value='".escape($contact_name_middle)."'>\n";
+echo "		</div>\n";
+
+echo "		<div class='label'>\n";
+echo "			".$text['label-contact_name_family']."\n";
+echo "		</div>\n";
+echo "		<div class='field no-wrap'>\n";
+echo "				<input class='formfld' type='text' name='contact_name_family' placeholder='' maxlength='255' value='".escape($contact_name_family)."'>\n";
+echo "		</div>\n";
+
+echo "		<div class='label'>\n";
+echo "			".$text['label-contact_name_suffix']."\n";
+echo "		</div>\n";
+echo "		<div class='field no-wrap'>\n";
+echo "				<input class='formfld' type='text' name='contact_name_suffix' placeholder='' maxlength='255' value='".escape($contact_name_suffix)."'>\n";
+echo "		</div>\n";
+
+echo "		<div class='label'>\n";
+echo "			".$text['label-contact_nickname']."\n";
+echo "		</div>\n";
+echo "		<div class='field no-wrap'>\n";
+echo "				<input class='formfld' type='text' name='contact_nickname' placeholder='' maxlength='255' value='".escape($contact_nickname)."'>\n";
+echo "		</div>\n";
+
+echo "		<div class='label empty_row' style='grid-row: 10 / span 99;'>\n";
+echo "			&nbsp;\n";
+echo "		</div>\n";
+echo "		<div class='field empty_row' style='grid-row: 10 / span 99;'>\n";
+echo "		</div>\n";
+
+echo "	</div>\n";
+
+
+echo "	<div class='form_set'>\n";
+echo "		<div class='heading'>\n";
+echo "			<b>".$text['option-other']."</b>\n";
+echo "		</div>\n";
+echo "		<div style='clear: both;'></div>\n";
+
+echo "		<div class='label'>\n";
+echo "			".$text['label-contact_type']."\n";
+echo "		</div>\n";
+echo "		<div class='field no-wrap'>\n";
+if (is_array($_SESSION["contact"]["type"])) {
+	sort($_SESSION["contact"]["type"]);
+	echo "	<select class='formfld' name='contact_type'>\n";
+	echo "		<option value=''></option>\n";
+	foreach($_SESSION["contact"]["type"] as $type) {
+		echo "	<option value='".escape($type)."' ".(($type == $contact_type) ? "selected='selected'" : null).">".escape($type)."</option>\n";
+	}
+	echo "	</select>\n";
+}
+else {
+	echo "	<select class='formfld' name='contact_type'>\n";
+	echo "		<option value=''></option>\n";
+	echo "		<option value='customer' ".(($contact_type == "customer") ? "selected='selected'" : null).">".$text['option-contact_type_customer']."</option>\n";
+	echo "		<option value='contractor' ".(($contact_type == "contractor") ? "selected='selected'" : null).">".$text['option-contact_type_contractor']."</option>\n";
+	echo "		<option value='friend' ".(($contact_type == "friend") ? "selected='selected'" : null).">".$text['option-contact_type_friend']."</option>\n";
+	echo "		<option value='lead' ".(($contact_type == "lead") ? "selected='selected'" : null).">".$text['option-contact_type_lead']."</option>\n";
+	echo "		<option value='member' ".(($contact_type == "member") ? "selected='selected'" : null).">".$text['option-contact_type_member']."</option>\n";
+	echo "		<option value='family' ".(($contact_type == "family") ? "selected='selected'" : null).">".$text['option-contact_type_family']."</option>\n";
+	echo "		<option value='subscriber' ".(($contact_type == "subscriber") ? "selected='selected'" : null).">".$text['option-contact_type_subscriber']."</option>\n";
+	echo "		<option value='supplier' ".(($contact_type == "supplier") ? "selected='selected'" : null).">".$text['option-contact_type_supplier']."</option>\n";
+	echo "		<option value='provider' ".(($contact_type == "provider") ? "selected='selected'" : null).">".$text['option-contact_type_provider']."</option>\n";
+	echo "		<option value='user' ".(($contact_type == "user") ? "selected='selected'" : null).">".$text['option-contact_type_user']."</option>\n";
+	echo "		<option value='volunteer' ".(($contact_type == "volunteer") ? "selected='selected'" : null).">".$text['option-contact_type_volunteer']."</option>\n";
+	echo "	</select>\n";
+}
+echo "		</div>\n";
+
+echo "		<div class='label'>\n";
+echo "			".$text['label-contact_title']."\n";
+echo "		</div>\n";
+echo "		<div class='field no-wrap'>\n";
+if (is_array($_SESSION['contact']['contact_title'])) {
+	echo "		<select class='formfld' name='contact_title'>\n";
+	echo "			<option value=''></option>\n";
+	sort($_SESSION['contact']['contact_title']);
+	foreach($_SESSION['contact']['contact_title'] as $row) {
+		echo "		<option value='".escape($row)."' ".(($row == $contact_title) ? "selected='selected'" : null).">".escape(ucwords($row))."</option>\n";
+	}
+	echo "		</select>\n";
+}
+else {
+	echo "		<input class='formfld' type='text' name='contact_title' placeholder='' maxlength='255' value='".escape($contact_title)."'>\n";
+}
+echo "		</div>\n";
+
+echo "		<div class='label'>\n";
+echo "			".$text['label-contact_role']."\n";
+echo "		</div>\n";
+echo "		<div class='field no-wrap'>\n";
+if (is_array($_SESSION['contact']['contact_role'])) {
+	echo "		<select class='formfld' name='contact_role'>\n";
+	echo "			<option value=''>".$text['label-contact_category']."</option>\n";
+	sort($_SESSION['contact']['contact_role']);
+	foreach($_SESSION['contact']['contact_role'] as $row) {
+		echo "		<option value='".escape($row)."' ".(($row == $contact_role) ? "selected='selected'" : null).">".escape(ucwords($row))."</option>\n";
+	}
+	echo "		</select>\n";
+}
+else {
+	echo "		<input class='formfld' type='text' name='contact_role'  placeholder='' maxlength='255' value='".escape($contact_role)."'>\n";
+}
+echo "		</div>\n";
+
+echo "		<div class='label'>\n";
+echo "			".$text['label-contact_category']."\n";
+echo "		</div>\n";
+echo "		<div class='field no-wrap'>\n";
+if (is_array($_SESSION['contact']['contact_category'])) {
+	echo "	<select class='formfld' name='contact_category'>\n";
+	echo "		<option value=''></option>\n";
+	sort($_SESSION['contact']['contact_category']);
+	foreach($_SESSION['contact']['contact_category'] as $row) {
+		echo "	<option value='".escape($row)."' ".(($row == $contact_category) ? "selected='selected'" : null).">".escape(ucwords($row))."</option>\n";
+	}
+	echo "	</select>\n";
+}
+else {
+	echo "	<input class='formfld' type='text' name='contact_category' placeholder='' maxlength='255' value='".escape($contact_category)."'>\n";
+}
+echo "		</div>\n";
+
+echo "		<div class='label'>\n";
+echo "			".$text['label-contact_time_zone']."\n";
+echo "		</div>\n";
+echo "		<div class='field no-wrap'>\n";
+echo "			<select class='formfld' id='contact_time_zone' name='contact_time_zone' style=''>\n";
+echo "				<option value=''></option>\n";
+//$list = DateTimeZone::listAbbreviations();
+$time_zone_identifiers = DateTimeZone::listIdentifiers();
+$previous_category = '';
+$x = 0;
+foreach ($time_zone_identifiers as $key => $val) {
+	$time_zone = explode("/", $val);
+	$category = $time_zone[0];
+	if ($category != $previous_category) {
+		if ($x > 0) {
+			echo "			</optgroup>\n";
+		}
+		echo "			<optgroup label='".$category."'>\n";
+	}
+	if (strlen($val) > 0) {
+		$time_zone_offset = get_time_zone_offset($val)/3600;
+		$time_zone_offset_hours = floor($time_zone_offset);
+		$time_zone_offset_minutes = ($time_zone_offset - $time_zone_offset_hours) * 60;
+		$time_zone_offset_minutes = number_pad($time_zone_offset_minutes, 2);
+		if ($time_zone_offset > 0) {
+			$time_zone_offset_hours = number_pad($time_zone_offset_hours, 2);
+			$time_zone_offset_hours = "+".$time_zone_offset_hours;
 		}
 		else {
-			echo "	<select class='formfld' name='contact_type'>\n";
-			echo "		<option value=''></option>\n";
-			echo "		<option value='customer' ".(($contact_type == "customer") ? "selected='selected'" : null).">".$text['option-contact_type_customer']."</option>\n";
-			echo "		<option value='contractor' ".(($contact_type == "contractor") ? "selected='selected'" : null).">".$text['option-contact_type_contractor']."</option>\n";
-			echo "		<option value='friend' ".(($contact_type == "friend") ? "selected='selected'" : null).">".$text['option-contact_type_friend']."</option>\n";
-			echo "		<option value='lead' ".(($contact_type == "lead") ? "selected='selected'" : null).">".$text['option-contact_type_lead']."</option>\n";
-			echo "		<option value='member' ".(($contact_type == "member") ? "selected='selected'" : null).">".$text['option-contact_type_member']."</option>\n";
-			echo "		<option value='family' ".(($contact_type == "family") ? "selected='selected'" : null).">".$text['option-contact_type_family']."</option>\n";
-			echo "		<option value='subscriber' ".(($contact_type == "subscriber") ? "selected='selected'" : null).">".$text['option-contact_type_subscriber']."</option>\n";
-			echo "		<option value='supplier' ".(($contact_type == "supplier") ? "selected='selected'" : null).">".$text['option-contact_type_supplier']."</option>\n";
-			echo "		<option value='provider' ".(($contact_type == "provider") ? "selected='selected'" : null).">".$text['option-contact_type_provider']."</option>\n";
-			echo "		<option value='user' ".(($contact_type == "user") ? "selected='selected'" : null).">".$text['option-contact_type_user']."</option>\n";
-			echo "		<option value='volunteer' ".(($contact_type == "volunteer") ? "selected='selected'" : null).">".$text['option-contact_type_volunteer']."</option>\n";
-			echo "	</select>\n";
+			$time_zone_offset_hours = str_replace("-", "", $time_zone_offset_hours);
+			$time_zone_offset_hours = "-".number_pad($time_zone_offset_hours, 2);
 		}
-		echo "</td>\n";
-		echo "</tr>\n";
+	}
+	if ($val == $contact_time_zone) {
+		echo "				<option value='".$val."' selected='selected'>(UTC ".$time_zone_offset_hours.":".$time_zone_offset_minutes.") ".$val."</option>\n";
+	}
+	else {
+		echo "				<option value='".$val."'>(UTC ".$time_zone_offset_hours.":".$time_zone_offset_minutes.") ".$val."</option>\n";
+	}
+	$previous_category = $category;
+	$x++;
+}
+echo "			</select>\n";
+echo "		</div>\n";
 
-		echo "<tr>\n";
-		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
-		echo "	".$text['label-contact_organization']."\n";
-		echo "</td>\n";
-		echo "<td class='vtable' align='left'>\n";
-		echo "	<input class='formfld' type='text' name='contact_organization' maxlength='255' value=\"".escape($contact_organization)."\">\n";
-		echo "</td>\n";
-		echo "</tr>\n";
+echo "		<div class='label'>\n";
+echo "			".$text['label-contact_note']."\n";
+echo "		</div>\n";
+echo "		<div class='field no-wrap'>\n";
+echo "			<textarea class='formfld' style='width: 100%; height: 100%;' name='contact_note'>".$contact_note."</textarea>\n";
+echo "		</div>\n";
 
-		echo "<tr>\n";
-		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
-		echo "	".$text['label-contact_name_prefix']."\n";
-		echo "</td>\n";
-		echo "<td class='vtable' align='left'>\n";
-		echo "	<input class='formfld' type='text' name='contact_name_prefix' maxlength='255' value=\"".escape($contact_name_prefix)."\">\n";
-		echo "</td>\n";
-		echo "</tr>\n";
+echo "		<div class='label empty_row' style='grid-row: 8 / span 99;'>\n";
+echo "			&nbsp;\n";
+echo "		</div>\n";
+echo "		<div class='field empty_row' style='grid-row: 8 / span 99;'>\n";
+echo "		</div>\n";
 
-		echo "<tr>\n";
-		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
-		echo "	".$text['label-contact_name_given']."\n";
-		echo "</td>\n";
-		echo "<td class='vtable' align='left'>\n";
-		echo "	<input class='formfld' type='text' name='contact_name_given' maxlength='255' value=\"".escape($contact_name_given)."\">\n";
-		echo "</td>\n";
-		echo "</tr>\n";
+echo "	</div>\n";
+unset($contact_note);
 
-		echo "<tr>\n";
-		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
-		echo "	".$text['label-contact_name_middle']."\n";
-		echo "</td>\n";
-		echo "<td class='vtable' align='left'>\n";
-		echo "	<input class='formfld' type='text' name='contact_name_middle' maxlength='255' value=\"".escape($contact_name_middle)."\">\n";
-		echo "</td>\n";
-		echo "</tr>\n";
+if (permission_exists('contact_user_view') || permission_exists('contact_group_view')) {
+	echo "	<div class='form_set'>\n";
+	echo "		<div class='heading'>\n";
+	echo "			<b>".$text['label-permissions']."</b>\n";
+	echo "		</div>\n";
+	echo "		<div style='clear: both;'></div>\n";
 
-		echo "<tr>\n";
-		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
-		echo "	".$text['label-contact_name_family']."\n";
-		echo "</td>\n";
-		echo "<td class='vtable' align='left'>\n";
-		echo "	<input class='formfld' type='text' name='contact_name_family' maxlength='255' value=\"".escape($contact_name_family)."\">\n";
-		echo "</td>\n";
-		echo "</tr>\n";
-
-		echo "<tr>\n";
-		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
-		echo "	".$text['label-contact_name_suffix']."\n";
-		echo "</td>\n";
-		echo "<td class='vtable' align='left'>\n";
-		echo "	<input class='formfld' type='text' name='contact_name_suffix' maxlength='255' value=\"".escape($contact_name_suffix)."\">\n";
-		echo "</td>\n";
-		echo "</tr>\n";
-
-		echo "<tr>\n";
-		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
-		echo "	".$text['label-contact_nickname']."\n";
-		echo "</td>\n";
-		echo "<td class='vtable' align='left'>\n";
-		echo "	<input class='formfld' type='text' name='contact_nickname' maxlength='255' value=\"".escape($contact_nickname)."\">\n";
-		echo "</td>\n";
-		echo "</tr>\n";
-
-		echo "<tr>\n";
-		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
-		echo "	".$text['label-contact_title']."\n";
-		echo "</td>\n";
-		echo "<td class='vtable' align='left'>\n";
-		if (is_array($_SESSION["contact"]["title"])) {
-			sort($_SESSION["contact"]["title"]);
-			echo "	<select class='formfld' name='contact_title'>\n";
-			echo "	<option value=''></option>\n";
-			foreach($_SESSION["contact"]["title"] as $title) {
-				echo "	<option value='".escape($title)."' ".(($title == $contact_title) ? "selected='selected'" : null).">".escape($title)."</option>\n";
+	if (permission_exists('contact_user_edit')) {
+		echo "		<div class='label' valign='top'>".$text['label-users']."</div>\n";
+		echo "		<div class='field no-wrap' align='left'>";
+		if ($action == "update" && is_array($contact_users_assigned) && @sizeof($contact_users_assigned) != 0) {
+			echo "		<div class='vtable'>".$text['label-username']."\n";
+			if ($contact_users_assigned && permission_exists('contact_user_delete')) {
+				//echo "		<div class='edit_delete_checkbox_all' onmouseover=\"swap_display('delete_label_users', 'delete_toggle_users');\" onmouseout=\"swap_display('delete_label_users', 'delete_toggle_users');\">\n";
+				echo "		<div style='float: right;'\">\n";
+				echo "			<span>".$text['label-delete']."</span>\n";
+				//echo "			<span id='delete_label_users'>".$text['label-delete']."</span>\n";
+				//echo "			<span id='delete_toggle_users'><input type='checkbox' id='checkbox_all_users' name='checkbox_all' onclick=\"edit_all_toggle('users');\"></span>\n";
+				echo "		</div>\n";
 			}
-			echo "	</select>\n";
-		}
-		else {
-			echo "	<input class='formfld' type='text' name='contact_title' maxlength='255' value=\"".escape($contact_title)."\">\n";
-		}
-		echo "</td>\n";
-		echo "</tr>\n";
-
-		echo "<tr>\n";
-		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
-		echo "	".$text['label-contact_category']."\n";
-		echo "</td>\n";
-		echo "<td class='vtable' align='left'>\n";
-		if (is_array($_SESSION["contact"]["category"])) {
-			sort($_SESSION["contact"]["category"]);
-			echo "	<select class='formfld' name='contact_category'>\n";
-			echo "	<option value=''></option>\n";
-			foreach($_SESSION["contact"]["category"] as $category) {
-				echo "	<option value='".escape($category)."' ".(($category == $contact_category) ? "selected='selected'" : null).">".escape($category)."</option>\n";
-			}
-			echo "	</select>\n";
-		}
-		else {
-			echo "	<input class='formfld' type='text' name='contact_category' maxlength='255' value=\"".escape($contact_category)."\">\n";
-		}
-		echo "</td>\n";
-		echo "</tr>\n";
-
-		echo "<tr>\n";
-		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
-		echo "	".$text['label-contact_role']."\n";
-		echo "</td>\n";
-		echo "<td class='vtable' align='left'>\n";
-		if (is_array($_SESSION["contact"]["role"])) {
-			sort($_SESSION["contact"]["role"]);
-			echo "	<select class='formfld' name='contact_role'>\n";
-			echo "	<option value=''></option>\n";
-			foreach($_SESSION["contact"]["role"] as $role) {
-				echo "	<option value='".escape($role)."' ".(($role == $contact_role) ? "selected='selected'" : null).">".escape($role)."</option>\n";
-			}
-			echo "	</select>\n";
-		}
-		else {
-			echo "	<input class='formfld' type='text' name='contact_role' maxlength='255' value=\"".escape($contact_role)."\">\n";
-		}
-		echo "</td>\n";
-		echo "</tr>\n";
-
-		echo "<tr>\n";
-		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
-		echo "	".$text['label-contact_time_zone']."\n";
-		echo "</td>\n";
-		echo "<td class='vtable' align='left'>\n";
-		echo "	<input class='formfld' type='text' name='contact_time_zone' maxlength='255' value=\"".escape($contact_time_zone)."\">\n";
-		echo "</td>\n";
-		echo "</tr>\n";
-
-		if (permission_exists('contact_user_edit')) {
-			echo "	<tr>";
-			echo "		<td class='vncell' valign='top'>".$text['label-users']."</td>";
-			echo "		<td class='vtable' align='left'>";
-			echo "			<table border='0' cellpadding='0' cellspacing='0' style='width: 100%;'>\n";
-			if ($action == "update" && is_array($contact_users_assigned) && @sizeof($contact_users_assigned) != 0) {
-				echo "				<tr>\n";
-				echo "					<td class='vtable'>".$text['label-username']."</td>\n";
+				echo "	</div>\n";
+			foreach ($contact_users_assigned as $x => $field) {
+				echo "		<div class='vtable'>".escape($field['username'])."\n";
 				if ($contact_users_assigned && permission_exists('contact_user_delete')) {
-					echo "					<td class='vtable edit_delete_checkbox_all' onmouseover=\"swap_display('delete_label_users', 'delete_toggle_users');\" onmouseout=\"swap_display('delete_label_users', 'delete_toggle_users');\">\n";
-					echo "						<span id='delete_label_users'>".$text['label-delete']."</span>\n";
-					echo "						<span id='delete_toggle_users'><input type='checkbox' id='checkbox_all_users' name='checkbox_all' onclick=\"edit_all_toggle('users');\"></span>\n";
-					echo "					</td>\n";
+					if (is_uuid($field['contact_user_uuid'])) {
+						echo "	<div style='text-align: center; padding-bottom: 3px; float: right; margin-right: 10px;'>\n";
+						//echo "		<input type='checkbox' name='contact_users_delete[".$x."][checked]' value='true' class='chk_delete checkbox_users' onclick=\"edit_delete_action('users');\">\n";
+						//echo "		<input type='hidden' name='contact_users_delete[".$x."][uuid]' value='".escape($field['contact_user_uuid'])."' />\n";
+						echo "		<input type='checkbox' name='contact_users[".$x."][checked]' value='true' class='chk_delete checkbox_users' onclick=\"edit_delete_action('users');\">\n";
+						echo "		<input type='hidden' name='contact_users[".$x."][uuid]' value='".escape($field['contact_user_uuid'])."' />\n";
+						echo "		<input type='hidden' name='contact_users[$x][domain_uuid]' value=\"".escape($_SESSION['domain_uuid'])."\">\n";
+						echo "		<input type='hidden' name='contact_users[$x][contact_user_uuid]' value='".escape($field['contact_user_uuid'])."' />\n";
+						echo "		<input type='hidden' name='contact_users[$x][contact_uuid]' value='".escape($field['contact_uuid'])."' />\n";
+					}
+					else {
+						echo "	<div>\n";
+					}
+					echo "	</div>\n";
 				}
-				echo "				</tr>\n";
-				foreach ($contact_users_assigned as $x => $field) {
-					echo "			<tr>\n";
-					echo "				<td class='vtable'>".escape($field['username'])."</td>\n";
-					if ($contact_users_assigned && permission_exists('contact_user_delete')) {
-						if (is_uuid($field['contact_user_uuid'])) {
-							echo "			<td class='vtable' style='text-align: center; padding-bottom: 3px;'>";
-							echo "				<input type='checkbox' name='contact_users_delete[".$x."][checked]' value='true' class='chk_delete checkbox_users' onclick=\"edit_delete_action('users');\">\n";
-							echo "				<input type='hidden' name='contact_users_delete[".$x."][uuid]' value='".escape($field['contact_user_uuid'])."' />\n";
+				echo "	</div>\n";
+			}
+		}
+		if (permission_exists('contact_user_add')) {
+			echo "		<div class='vtable' style='border-bottom: none;'>\n";
+			echo "			<select name='contact_user_uuid' class='formfld' style='width: auto;'>\n";
+			echo "				<option value=''></option>\n";
+			foreach ($users as $field) {
+				if (in_array($field['user_uuid'], array_column($contact_users_assigned, 'user_uuid'))) { continue; } //skip users already assigned
+				echo "				<option value='".escape($field['user_uuid'])."'>".escape($field['username'])."</option>\n";
+			}
+			echo "			</select>\n";
+			if ($action == "update") {
+				echo button::create(['type'=>'submit','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add']]);
+			}
+			unset($users);
+			echo "		</div>\n";
+		}
+		echo "		".$text['description-users']."\n";
+		echo "		</div>\n";
+	}
+
+	if (permission_exists('contact_group_view')) {
+		echo "	<div class='label'>".$text['label-groups']."</div>";
+		echo "	<div class='field no-wrap'>";
+		if (is_array($contact_groups_assigned) && @sizeof($contact_groups_assigned) != 0) {
+			echo "	<div class='vtable'>".$text['label-group']."\n";
+			if ($contact_groups_assigned && permission_exists('contact_group_delete')) {
+				//echo "	<div class='edit_delete_checkbox_all' style='float: right;' onmouseover=\"swap_display('delete_label_groups', 'delete_toggle_groups');\" onmouseout=\"swap_display('delete_label_groups', 'delete_toggle_groups');\">\n";
+				echo "	<div style='float: right;'\">\n";
+				echo "		<span>".$text['label-delete']."</span>\n";
+				//echo "		<span id='delete_label_groups'>".$text['label-delete']."</span>\n";
+				//echo "		<span id='delete_toggle_groups' style='margin-right: 10px;'><input type='checkbox' id='checkbox_all_groups' name='checkbox_all' onclick=\"edit_all_toggle('groups');\"></span>\n";
+				echo "	</div>\n";
+			}
+			echo "	</div>\n";
+			foreach ($contact_groups_assigned as $x => $field) {
+				if (strlen($field['group_name']) > 0) {
+					echo "	<div class='vtable'>".escape($field['group_name'])."\n";
+					if (permission_exists('contact_group_delete')) {
+						if (is_uuid($field['contact_group_uuid'])) {
+							echo "	<div style='text-align: center; padding-bottom: 3px; float: right; margin-right: 10px;'>";
+							//echo "		<input type='checkbox' name='contact_groups_delete[".$x."][checked]' value='true' class='chk_delete checkbox_groups' onclick=\"edit_delete_action('groups');\">\n";
+							//echo "		<input type='hidden' name='contact_groups_delete[".$x."][uuid]' value='".escape($field['contact_group_uuid'])."' />\n";
+							echo "		<input type='checkbox' name='contact_groups[".$x."][checked]' value='true' class='chk_delete checkbox_groups' onclick=\"edit_delete_action('groups');\">\n";
+							echo "		<input type='hidden' name='contact_groups[".$x."][uuid]' value='".escape($field['contact_group_uuid'])."' />\n";
+							echo "		<input type='hidden' name='contact_groups[$x][domain_uuid]' value=\"".escape($_SESSION['domain_uuid'])."\">\n";
+							echo "		<input type='hidden' name='contact_groups[$x][contact_group_uuid]' value='".escape($field['contact_group_uuid'])."' />\n";
+							echo "		<input type='hidden' name='contact_groups[$x][contact_uuid]' value='".escape($contact_uuid)."' />\n";
 						}
 						else {
-							echo "			<td>";
+							echo "	<div>";
 						}
-						echo "			</td>\n";
+						echo "	</div>\n";
 					}
-					echo "			</tr>\n";
+					echo "	</div>\n";
 				}
 			}
-			if (permission_exists('contact_user_add')) {
-				echo "			<tr>\n";
-				echo "				<td class='vtable' style='border-bottom: none;' colspan='2'>\n";
-				echo "					<select name='user_uuid' class='formfld' style='width: auto;'>\n";
-				echo "						<option value=''></option>\n";
-				foreach ($users as $field) {
-					if (in_array($field['user_uuid'], array_column($contact_users_assigned, 'user_uuid'))) { continue; } //skip users already assigned
-					echo "						<option value='".escape($field['user_uuid'])."'>".escape($field['username'])."</option>\n";
+		}
+
+		if (permission_exists('contact_group_add')) {
+			if (is_array($contact_groups_available) && @sizeof($contact_groups_available) != 0) {
+				echo "	<div class='vtable' style='border-bottom: none;'>\n";
+
+				echo "		<select name='contact_group_uuid' class='formfld' style='width: auto; margin-right: 3px;'>\n";
+				echo "		<option value=''></option>\n";
+				foreach ($contact_groups_available as $field) {
+					if ($field['group_name'] == "superadmin" && !if_group("superadmin")) { continue; }	//only show superadmin group to superadmins
+					if ($field['group_name'] == "admin" && (!if_group("superadmin") && !if_group("admin"))) { continue; }	//only show admin group to admins
+					echo "		<option value='".escape($field['group_uuid'])."'>".escape($field['group_name'])."</option>\n";
 				}
-				echo "					</select>";
+				echo "		</select>";
 				if ($action == "update") {
 					echo button::create(['type'=>'submit','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add']]);
 				}
-				unset($users);
-				echo "				</td>\n";
-				echo "			<tr>\n";
+				echo "	</div>\n";
 			}
-			echo "			</table>\n";
-			echo "			".$text['description-users']."\n";
-			echo "		</td>";
-			echo "	</tr>";
+		}
+		echo "		".$text['description-groups']."\n";
+		echo "	</div>\n";
+	}
+
+	echo "		<div class='label empty_row' style='grid-row: 4 / span 99;'>\n";
+	echo "			&nbsp;\n";
+	echo "		</div>\n";
+	echo "		<div class='field empty_row' style='grid-row: 4 / span 99;'>\n";
+	echo "		</div>\n";
+
+	echo "	</div>\n";
+}
+
+if (permission_exists('contact_phone_view')) {
+	$x = 0;
+	foreach($contact_phones as $row) {
+		echo "	<div class='form_set'>\n";
+		echo "		<div class='heading' style='position: absolute;'>\n";
+		echo "			<b style='float: left;'>".$text['label-phone_numbers']."</b>\n";
+		if ($row['phone_primary'] == "1") {
+			echo "		<i class='fas fa-star fa-xs' style='color: ".$_SESSION['theme']['input_background_color']."; float: left; margin-top: 8px; margin-left: 8px;' title=\"".$text['label-primary']."\"></i>\n";
+		}
+		if (permission_exists('contact_phone_delete')) {
+			echo "		<div class='checkbox' style='margin-left: 8px; margin-top: 4px; float: left;'>\n";
+			echo "			<input type='checkbox' name='contact_phones[$x][checked]' id='checkbox_".$x."' class='chk_delete checkbox_phones' value='true' onclick=\"edit_delete_action('phones');\">\n";
+			echo "			<input type='hidden' name='contact_phones[$x][uuid]' value='".escape($row['contact_phone_uuid'])."' />\n";
+			echo "		</div>\n";
+		}
+		echo "		</div>\n";
+		echo "		<br>\n";
+		echo "		<div style='clear: both; margin-bottom: 25px;'></div>\n";
+
+		echo "		<input type='hidden' name='contact_phones[$x][domain_uuid]' value=\"".escape($row["domain_uuid"])."\">\n";
+		echo "		<input type='hidden' name='contact_phones[$x][contact_uuid]' value=\"".escape($row["contact_uuid"])."\">\n";
+		echo "		<input type='hidden' name='contact_phones[$x][contact_phone_uuid]' value=\"".escape($row["contact_phone_uuid"])."\">\n";
+
+		echo "		<div class='label'>\n";
+		echo "			".$text['label-phone_label']."\n";
+		echo "		</div>\n";
+		echo "		<div class='field no-wrap'>\n";
+		echo "				<select class='formfld' name='contact_phones[$x][phone_label]' style=''>\n";
+		echo "					<option value=''></option>\n";
+		if ($row['phone_label'] == "work") {
+			echo "					<option value='work' selected='selected'>".$text['option-work']."</option>\n";
+		}
+		else {
+			echo "					<option value='work'>".$text['option-work']."</option>\n";
+		}
+		if ($row['phone_label'] == "home") {
+			echo "					<option value='home' selected='selected'>".$text['option-home']."</option>\n";
+		}
+		else {
+			echo "					<option value='home'>".$text['option-home']."</option>\n";
+		}
+		if ($row['phone_label'] == "mobile") {
+			echo "					<option value='mobile' selected='selected'>".$text['option-mobile']."</option>\n";
+		}
+		else {
+			echo "					<option value='mobile'>".$text['option-mobile']."</option>\n";
+		}
+		if ($row['phone_label'] == "main") {
+			echo "					<option value='main' selected='selected'>".$text['option-main']."</option>\n";
+		}
+		else {
+			echo "					<option value='main'>".$text['option-main']."</option>\n";
+		}
+		if ($row['phone_label'] == "fax") {
+			echo "					<option value='fax' selected='selected'>".$text['option-fax']."</option>\n";
+		}
+		else {
+			echo "					<option value='fax'>".$text['option-fax']."</option>\n";
+		}
+		if ($row['phone_label'] == "voicemail") {
+			echo "					<option value='voicemail' selected='selected'>".$text['option-voicemail']."</option>\n";
+		}
+		else {
+			echo "					<option value='voicemail'>".$text['option-voicemail']."</option>\n";
+		}
+		if ($row['phone_label'] == "text") {
+			echo "					<option value='text' selected='selected'>".$text['option-text']."</option>\n";
+		}
+		else {
+			echo "					<option value='text'>".$text['option-text']."</option>\n";
+		}
+		if ($row['phone_label'] == "other") {
+			echo "					<option value='other' selected='selected'>".$text['option-other']."</option>\n";
+		}
+		else {
+			echo "					<option value='other'>".$text['option-other']."</option>\n";
+		}
+		echo "				</select>\n";
+		//echo 				$text['description-phone_label']."\n";
+		echo "		</div>\n";
+
+		echo "		<div class='label'>\n";
+		echo "			".$text['label-phone_type']."\n";
+		echo "		</div>\n";
+		echo "		<div class='field no-wrap'>\n";
+		echo "			<label><input type='checkbox' name='contact_phones[$x][phone_type_voice]' id='phone_type_voice' value='1' ".(($row['phone_type_voice']) ? "checked='checked'" : null)."> ".$text['label-voice']."</label>&nbsp;\n";
+		echo "			<label><input type='checkbox' name='contact_phones[$x][phone_type_fax]' id='phone_type_fax' value='1' ".(($row['phone_type_fax']) ? "checked='checked'" : null)."> ".$text['label-fax']."</label>&nbsp;\n";
+		echo "			<label><input type='checkbox' name='contact_phones[$x][phone_type_video]' id='phone_type_video' value='1' ".(($row['phone_type_video']) ? "checked='checked'" : null)."> ".$text['label-video']."</label>&nbsp;\n";
+		echo "			<label><input type='checkbox' name='contact_phones[$x][phone_type_text]' id='phone_type_text' value='1' ".(($row['phone_type_text']) ? "checked='checked'" : null)."> ".$text['label-text']."</label>\n";
+		echo "			<br />\n";
+		//echo 			$text['description-phone_type']."\n";
+		echo "		</div>\n";
+
+		echo "		<div class='label'>\n";
+		echo "			".$text['label-phone_speed_dial']."\n";
+		echo "		</div>\n";
+		echo "		<div class='field no-wrap'>\n";
+		echo "				<input class='formfld' type='text' name='contact_phones[$x][phone_speed_dial]' placeholder='' maxlength='255' style='' value=\"".escape($row["phone_speed_dial"])."\">\n";
+		//echo 				$text['description-phone_extension']."\n";
+		echo "		</div>\n";
+
+		echo "		<div class='label'>\n";
+		echo "			".$text['label-phone_number']."\n";
+		echo "		</div>\n";
+		echo "		<div class='field no-wrap'>\n";
+		echo "				<input class='formfld' type='text' name='contact_phones[$x][phone_number]' placeholder='' style=''  maxlength='255' style='max-width:90px;' value=\"".escape($row["phone_number"])."\">\n";
+		//echo 				$text['description-phone_speed_dial']."\n";
+		echo "		</div>\n";
+
+		echo "		<div class='label'>\n";
+		echo "			".$text['label-phone_extension']."\n";
+		echo "		</div>\n";
+		echo "		<div class='field no-wrap'>\n";
+		echo "				<input class='formfld' type='text' name='contact_phones[$x][phone_extension]' placeholder='' style='' maxlength='255' value=\"".escape($row["phone_extension"])."\">\n";
+		//echo 				$text['description-phone_number']."\n";
+		echo "		</div>\n";
+
+		echo "		<div class='label'>\n";
+		echo "			".$text['label-primary']."\n";
+		echo "		</div>\n";
+		echo "		<div class='field no-wrap'>\n";
+
+		echo "				<select class='formfld' name='contact_phones[$x][phone_primary]' style='width: auto;'>\n";
+		echo "					<option value=''></option>\n";
+		if ($row['phone_primary'] == "1") {
+			echo "					<option value='1' selected='selected'>".$text['label-true']."</option>\n";
+		}
+		else {
+			echo "					<option value='1'>".$text['label-true']."</option>\n";
+		}
+		if ($row['phone_primary'] == "0") {
+			echo "					<option value='0' selected='selected'>".$text['label-false']."</option>\n";
+		}
+		else {
+			echo "					<option value='0'>".$text['label-false']."</option>\n";
+		}
+		echo "				</select>\n";
+		//echo 				$text['description-phone_primary']."\n";
+		echo "		</div>\n";
+
+		echo "		<div class='label'>\n";
+		echo "			".$text['label-phone_description']."\n";
+		echo "		</div>\n";
+		echo "		<div class='field no-wrap'>\n";
+		echo "				<input class='formfld' type='text' name='contact_phones[$x][phone_description]' placeholder='' maxlength='255' value=\"".escape($row["phone_description"])."\">\n";
+		//echo 				$text['description-phone_description']."\n";
+		echo "		</div>\n";
+	
+		echo "		<div class='label empty_row' style='grid-row: 9 / span 99;'>\n";
+		echo "			&nbsp;\n";
+		echo "		</div>\n";
+		echo "		<div class='field empty_row' style='grid-row: 9 / span 99;'>\n";
+		echo "		</div>\n";
+
+		//if (is_array($contact_phones) && @sizeof($contact_phones) > 1 && permission_exists('contact_phone_delete')) {
+		//	echo "		<div class='label'>\n";
+		//	echo "			".$text['label-action']."\n";
+		//	echo "		</div>\n";
+		//	echo "		<div class='field no-wrap'>\n";
+		//	//echo "			<span id='delete_label_details'>".$text['label-action']."</span>\n";
+		//	echo "			<span id='delete_toggle_details'>\n";
+		//	//echo "				<input type='checkbox' name='contact_phones[".$x."][checked]' value='true' class='chk_delete checkbox_details' onclick=\"checkbox_on_change(this);\">\n";
+		//	echo "				<input type='checkbox' id='checkbox_all_details' name='checkbox_all' onclick=\"edit_all_toggle('details'); checkbox_on_change(this);\">\n";
+		//	echo "			</span>\n";
+		//	echo "		</div>\n";
+		//}
+
+		echo "	</div>\n";
+		$x++;
+	}
+}
+
+if (permission_exists('contact_address_view')) {
+	foreach($contact_addresses as $row) {
+		echo "	<div class='form_set'>\n";
+		echo "		<div class='heading'>\n";
+		echo "			<b style='float: left;'>".$text['label-addresses']."</b>\n";
+		if ($row['address_primary'] == "1") {
+			echo "		<i class='fas fa-star fa-xs' style='color: ".$_SESSION['theme']['input_background_color']."; float: left; margin-top: 8px; margin-left: 8px;' title=\"".$text['label-primary']."\"></i>\n";
+		}
+		if (permission_exists('contact_address_delete')) {
+			echo "		<div class='checkbox' style='margin-left: 8px; margin-top: 4px; float: left;'>\n";
+			echo "			<input type='checkbox' name='contact_addresses[$x][checked]' id='checkbox_".$x."' class='chk_delete checkbox_addresses' value='true' onclick=\"edit_delete_action('addresses');\">\n";
+			echo "			<input type='hidden' name='contact_addresses[$x][uuid]' value='".escape($row['contact_address_uuid'])."' />\n";
+			echo "		</div>\n";
+		}
+		echo "			<div class='button no-link' style='margin-left: 8px; margin-top: 2px; float: left;'>\n";
+		$map_query = $row['address_street']." ".$row['address_extended'].", ".$row['address_locality'].", ".$row['address_region'].", ".$row['address_region'].", ".$row['address_postal_code'];
+		echo " 				<a href=\"http://maps.google.com/maps?q=".urlencode($map_query)."&hl=en\" target=\"_blank\">";
+		echo " 					<img src='resources/images/icon_gmaps.png' style='width: 17px; height: 17px;' alt='".$text['label-google_map']."' title='".$text['label-google_map']."'>";
+		echo " 				</a>\n";
+		echo "			</div>\n";
+		
+		echo "		</div>\n";
+		echo "		<div style='clear: both;'></div>\n";
+
+		echo "		<input type='hidden' name='contact_addresses[$x][domain_uuid]' value=\"".escape($row["domain_uuid"])."\">\n";
+		echo "		<input type='hidden' name='contact_addresses[$x][contact_uuid]' value=\"".escape($row["contact_uuid"])."\">\n";
+		echo "		<input type='hidden' name='contact_addresses[$x][contact_address_uuid]' value=\"".escape($row["contact_address_uuid"])."\">\n";
+
+		echo "		<div class='label'>\n";
+		echo "			".$text['label-address_label']."\n";
+		echo "		</div>\n";
+		echo "		<div class='field no-wrap'>\n";
+		echo "			<select class='formfld' name='contact_addresses[$x][address_label]'>\n";
+		echo "				<option value=''></option>\n";
+		if ($row['address_label'] == "work") {
+			echo "				<option value='work' selected='selected'>".$text['option-work']."</option>\n";
+		}
+		else {
+			echo "				<option value='work'>".$text['option-work']."</option>\n";
+		}
+		if ($row['address_label'] == "home") {
+			echo "				<option value='home' selected='selected'>".$text['option-home']."</option>\n";
+		}
+		else {
+			echo "				<option value='home'>".$text['option-home']."</option>\n";
+		}
+		if ($row['address_label'] == "mobile") {
+			echo "				<option value='mobile' selected='selected'>".$text['option-mobile']."</option>\n";
+		}
+		else {
+			echo "				<option value='mobile'>".$text['option-mobile']."</option>\n";
+		}
+		if ($row['address_label'] == "main") {
+			echo "				<option value='main' selected='selected'>".$text['option-main']."</option>\n";
+		}
+		else {
+			echo "				<option value='main'>".$text['option-main']."</option>\n";
+		}
+		if ($row['address_label'] == "fax") {
+			echo "				<option value='fax' selected='selected'>".$text['option-fax']."</option>\n";
+		}
+		else {
+			echo "				<option value='fax'>".$text['option-fax']."</option>\n";
+		}
+		if ($row['address_label'] == "pager") {
+			echo "				<option value='pager' selected='selected'>".$text['option-pager']."</option>\n";
+		}
+		else {
+			echo "				<option value='pager'>".$text['option-pager']."</option>\n";
+		}
+		if ($row['address_label'] == "voicemail") {
+			echo "				<option value='voicemail' selected='selected'>".$text['option-voicemail']."</option>\n";
+		}
+		else {
+			echo "				<option value='voicemail'>".$text['option-voicemail']."</option>\n";
+		}
+		if ($row['address_label'] == "text") {
+			echo "				<option value='text' selected='selected'>".$text['option-text']."</option>\n";
+		}
+		else {
+			echo "				<option value='text'>".$text['option-text']."</option>\n";
+		}
+		echo "			</select>\n";
+		echo "		</div>\n";
+
+		echo "		<div class='label'>\n";
+		echo "			".$text['label-address_type']."\n";
+		echo "		</div>\n";
+		echo "		<div class='field no-wrap'>\n";
+		echo "			<select class='formfld' name='contact_addresses[$x][address_type]'>\n";
+		echo "				<option value=''></option>\n";
+		if ($row['address_type'] == "work") {
+			echo "				<option value='work' selected='selected'>".$text['option-work']."</option>\n";
+		}
+		else {
+			echo "				<option value='work'>".$text['option-work']."</option>\n";
+		}
+		if ($row['address_type'] == "home") {
+			echo "				<option value='home' selected='selected'>".$text['option-home']."</option>\n";
+		}
+		else {
+			echo "				<option value='home'>".$text['option-home']."</option>\n";
+		}
+		if ($row['address_type'] == "domestic") {
+			echo "				<option value='domestic' selected='selected'>".$text['option-dom']."</option>\n";
+		}
+		else {
+			echo "				<option value='domestic'>".$text['option-dom']."</option>\n";
+		}
+		if ($row['address_type'] == "international") {
+			echo "				<option value='international' selected='selected'>".$text['option-intl']."</option>\n";
+		}
+		else {
+			echo "				<option value='international'>".$text['option-intl']."</option>\n";
+		}
+		if ($row['address_type'] == "postal") {
+			echo "				<option value='postal' selected='selected'>".$text['option-postal']."</option>\n";
+		}
+		else {
+			echo "				<option value='postal'>".$text['option-postal']."</option>\n";
+		}
+		if ($row['address_type'] == "parcel") {
+			echo "				<option value='parcel' selected='selected'>".$text['option-parcel']."</option>\n";
+		}
+		else {
+			echo "				<option value='parcel'>".$text['option-parcel']."</option>\n";
+		}
+		if ($row['address_type'] == "preferred") {
+			echo "				<option value='preferred' selected='selected'>".$text['option-pref']."</option>\n";
+		}
+		else {
+			echo "				<option value='preferred'>".$text['option-pref']."</option>\n";
+		}
+		echo "			</select>\n";
+		echo "		</div>\n";
+
+		echo "		<div class='label'>\n";
+		echo "			".$text['label-address_address']."\n";
+		echo "		</div>\n";
+		echo "		<div class='field no-wrap'>\n";
+		echo "			<input class='formfld' type='text' name='contact_addresses[$x][address_street]' placeholder='".$text['label-address_address']." 1' maxlength='255' value=\"".escape($row["address_street"])."\"><br />\n";
+		echo "			<input class='formfld' type='text' name='contact_addresses[$x][address_extended]' placeholder='".$text['label-address_address']." 2' maxlength='255' value=\"".escape($row["address_extended"])."\">\n";
+		echo "		</div>\n";
+
+		if (permission_exists('address_community')) {
+			echo "		<div class='label'>\n";
+			echo "			".$text['label-address_community']."\n";
+			echo "		</div>\n";
+			echo "		<div class='field no-wrap'>\n";
+			echo "			<input class='formfld' type='text' name='contact_addresses[$x][address_community]' placeholder='' maxlength='255' value=\"".escape($row["address_community"])."\">\n";
+			echo "		</div>\n";
 		}
 
-		if (permission_exists('contact_group_view')) {
-			echo "<tr>";
-			echo "	<td class='vncell' valign='top'>".$text['label-groups']."</td>";
-			echo "	<td class='vtable'>";
-			echo "		<table border='0' cellpadding='0' cellspacing='0' style='width: 100%;'>\n";
-			if (is_array($contact_groups_assigned) && @sizeof($contact_groups_assigned) != 0) {
-				echo "			<tr>\n";
-				echo "				<td class='vtable'>".$text['label-group']."</td>\n";
-				if ($contact_groups_assigned && permission_exists('contact_group_delete')) {
-					echo "				<td class='vtable edit_delete_checkbox_all' onmouseover=\"swap_display('delete_label_groups', 'delete_toggle_groups');\" onmouseout=\"swap_display('delete_label_groups', 'delete_toggle_groups');\">\n";
-					echo "					<span id='delete_label_groups'>".$text['label-delete']."</span>\n";
-					echo "					<span id='delete_toggle_groups'><input type='checkbox' id='checkbox_all_groups' name='checkbox_all' onclick=\"edit_all_toggle('groups');\"></span>\n";
-					echo "				</td>\n";
-				}
-				echo "			</tr>\n";
-				foreach ($contact_groups_assigned as $x => $field) {
-					if (strlen($field['group_name']) > 0) {
-						echo "			<tr>\n";
-						echo "				<td class='vtable'>".escape($field['group_name'])."</td>\n";
-						if (permission_exists('contact_group_delete')) {
-							if (is_uuid($field['contact_group_uuid'])) {
-								echo "				<td class='vtable' style='text-align: center; padding-bottom: 3px;'>";
-								echo "					<input type='checkbox' name='contact_groups_delete[".$x."][checked]' value='true' class='chk_delete checkbox_groups' onclick=\"edit_delete_action('groups');\">\n";
-								echo "					<input type='hidden' name='contact_groups_delete[".$x."][uuid]' value='".escape($field['contact_group_uuid'])."' />\n";
-							}
-							else {
-								echo "				<td>";
-							}
-							echo "				</td>\n";
+		echo "		<div class='label'>\n";
+		echo "			".$text['label-address_locality']."\n";
+		echo "		</div>\n";
+		echo "		<div class='field no-wrap'>\n";
+		echo "			<input class='formfld' type='text' name='contact_addresses[$x][address_locality]' placeholder='' maxlength='255' value=\"".escape($row["address_locality"])."\">\n";
+		echo "		</div>\n";
+
+		echo "		<div class='label'>\n";
+		echo "			".$text['label-address_region']."\n";
+		echo "		</div>\n";
+		echo "		<div class='field no-wrap'>\n";
+		echo "			<input class='formfld' type='text' name='contact_addresses[$x][address_region]' placeholder='' maxlength='255' value=\"".escape($row["address_region"])."\">\n";
+		echo "		</div>\n";
+	
+		echo "		<div class='label'>\n";
+		echo "			".$text['label-address_postal_code']."\n";
+		echo "		</div>\n";
+		echo "		<div class='field no-wrap'>\n";
+		echo "			<input class='formfld' type='text' name='contact_addresses[$x][address_postal_code]' placeholder='' maxlength='255' value=\"".escape($row["address_postal_code"])."\">\n";
+		echo "		</div>\n";
+
+		echo "		<div class='label'>\n";
+		echo "			".$text['label-address_country']."\n";
+		echo "		</div>\n";
+		echo "		<div class='field no-wrap'>\n";
+		echo "			<input class='formfld' type='text' name='contact_addresses[$x][address_country]' placeholder='' maxlength='255' value=\"".escape($row["address_country"])."\">\n";
+		echo "		</div>\n";
+
+		if (permission_exists('address_latitude')) {
+			echo "		<div class='label'>\n";
+			echo "			".$text['label-address_latitude']."\n";
+			echo "		</div>\n";
+			echo "		<div class='field no-wrap'>\n";
+			echo "			<input class='formfld' type='text' name='contact_addresses[$x][address_latitude]' placeholder='".escape($text['label-address_latitude'])."' maxlength='255' value=\"".escape($row["address_latitude"])."\">\n";
+			echo "		</div>\n";
+		}
+
+		if (permission_exists('address_longitude')) {
+			echo "		<div class='label'>\n";
+			echo "			".$text['label-address_longitude']."\n";
+			echo "		</div>\n";
+			echo "		<div class='field no-wrap'>\n";
+			echo "			<input class='formfld' type='text' name='contact_addresses[$x][address_longitude]' placeholder='".escape($text['label-address_longitude'])."' maxlength='255' value=\"".escape($row["address_longitude"])."\">\n";
+			echo "		</div>\n";
+		}
+
+		echo "		<div class='label'>\n";
+		echo "			".$text['label-primary']."\n";
+		echo "		</div>\n";
+		echo "		<div class='field no-wrap'>\n";
+		echo "			<select class='formfld' name='contact_addresses[$x][address_primary]' style='width: auto;'>\n";
+		echo "				<option value=''>".escape($text['label-address_primary'])."</option>\n";
+		if ($row['address_primary'] == "1") {
+			echo "			<option value='1' selected='selected'>".$text['label-true']."</option>\n";
+		}
+		else {
+			echo "			<option value='1'>".$text['label-true']."</option>\n";
+		}
+		if ($row['address_primary'] == "0") {
+			echo "			<option value='0' selected='selected'>".$text['label-false']."</option>\n";
+		}
+		else {
+			echo "			<option value='0'>".$text['label-false']."</option>\n";
+		}
+		echo "			</select>\n";
+		echo "		</div>\n";
+
+		echo "		<div class='label'>\n";
+		echo "			".$text['label-address_description']."\n";
+		echo "		</div>\n";
+		echo "		<div class='field no-wrap'>\n";
+		echo "			<input class='formfld' type='text' name='contact_addresses[$x][address_description]' placeholder='' maxlength='255' value=\"".escape($row["address_description"])."\">\n";
+		echo "		</div>\n";
+
+		//if (is_array($contact_addresses) && @sizeof($contact_addresses) > 1 && permission_exists('contact_address_delete')) {
+		//	if (is_uuid($row['contact_address_uuid'])) {
+		//		echo "		<div class='label'>\n";
+		//		echo "			".$text['label-action']."\n";
+		//		echo "		</div>\n";
+		//		echo "		<div class='field no-wrap'>\n";
+		//		echo "			<input type='checkbox' name='contact_addresses[".$x."][checked]' value='true' class='chk_delete checkbox_details' onclick=\"checkbox_on_change(this);\">\n";
+		//		echo "		</div>\n";
+		//	}
+		//}
+
+		echo "	</div>\n";
+		$x++;
+	}
+}
+
+if (permission_exists('contact_email_view')) {
+	$x = 0;
+	foreach($contact_emails as $row) {
+		echo "	<div class='form_set'>\n";
+		echo "		<div class='heading'>\n";
+		echo "			<b style='float: left;'>".$text['label-emails']."</b>\n";
+		if ($row['email_primary'] == "1") {
+			echo "		<i class='fas fa-star fa-xs' style='color: ".$_SESSION['theme']['input_background_color']."; float: left; margin-top: 8px; margin-left: 8px;' title=\"".$text['label-primary']."\"></i>\n";
+		}
+		if (permission_exists('contact_email_delete')) {
+			echo "		<div class='checkbox' style='margin-left: 8px; margin-top: 4px; float: left;'>\n";
+			echo "			<input type='checkbox' name='contact_emails[$x][checked]' id='checkbox_".$x."' class='chk_delete checkbox_emails' value='true' onclick=\"edit_delete_action('emails');\">\n";
+			echo "			<input type='hidden' name='contact_emails[$x][uuid]' value='".escape($row['contact_email_uuid'])."' />\n";
+			echo "		</div>\n";
+		}
+		echo "		</div>\n";
+		echo "		<div style='clear: both;'></div>\n";
+
+		echo "		<input type='hidden' name='contact_emails[$x][domain_uuid]' value=\"".escape($row["domain_uuid"])."\">\n";
+		echo "		<input type='hidden' name='contact_emails[$x][contact_uuid]' value=\"".escape($row["contact_uuid"])."\">\n";
+		echo "		<input type='hidden' name='contact_emails[$x][contact_email_uuid]' value=\"".escape($row["contact_email_uuid"])."\">\n";
+
+		echo "		<div class='label'>\n";
+		echo "			".$text['label-email_label']."\n";
+		echo "		</div>\n";
+		echo "		<div class='field no-wrap'>\n";
+		echo "				<input class='formfld' type='text' name='contact_emails[$x][email_label]' placeholder='".escape($text['label-email_label'])."' maxlength='255' value=\"".escape($row["email_label"])."\">\n";
+		echo "		</div>\n";
+
+		echo "		<div class='label'>\n";
+		echo "			".$text['label-email_address']."\n";
+		echo "		</div>\n";
+		echo "		<div class='field no-wrap'>\n";
+		echo "				<input class='formfld' type='text' name='contact_emails[$x][email_address]' placeholder='".escape($text['label-email_address'])."' maxlength='255' value=\"".escape($row["email_address"])."\">\n";
+		echo "		</div>\n";
+
+		echo "		<div class='label'>\n";
+		echo "			".$text['label-primary']."\n";
+		echo "		</div>\n";
+		echo "		<div class='field no-wrap'>\n";
+		echo "				<select class='formfld' name='contact_emails[$x][email_primary]' style='width: auto;'>\n";
+		echo "					<option value=''>".escape($text['label-contact_emails'])."</option>\n";
+		if ($row['email_primary'] == "1") {
+			echo "					<option value='1' selected='selected'>".$text['label-true']."</option>\n";
+		}
+		else {
+			echo "					<option value='1'>".$text['label-true']."</option>\n";
+		}
+		if ($row['email_primary'] == "0") {
+			echo "					<option value='0' selected='selected'>".$text['label-false']."</option>\n";
+		}
+		else {
+			echo "					<option value='0'>".$text['label-false']."</option>\n";
+		}
+		echo "				</select>\n";
+		//echo "				<br />\n";
+		//echo 				$text['description-email_primary']."\n";
+		echo "		</div>\n";
+
+		echo "		<div class='label'>\n";
+		echo "			".$text['label-email_description']."\n";
+		echo "		</div>\n";
+		echo "		<div class='field no-wrap'>\n";
+		echo "				<input class='formfld' type='text' name='contact_emails[$x][email_description]' placeholder='' maxlength='255' value=\"".escape($row["email_description"])."\">\n";
+		echo "		</div>\n";
+
+		echo "		<div class='label empty_row' style='grid-row: 6 / span 99;'>\n";
+		echo "			&nbsp;\n";
+		echo "		</div>\n";
+		echo "		<div class='field empty_row' style='grid-row: 6 / span 99;'>\n";
+		echo "		</div>\n";
+
+		//if (is_array($contact_emails) && @sizeof($contact_emails) > 1 && permission_exists('contact_email_delete')) {
+		//	if (is_uuid($row['contact_email_uuid'])) {
+		//		echo "		<div class='label'>\n";
+		//		echo "			".$text['label-action']."\n";
+		//		echo "		</div>\n";
+		//		echo "		<div class='field no-wrap'>\n";
+		//		echo "			<input type='checkbox' name='contact_emails[".$x."][checked]' value='true' class='chk_delete checkbox_details' onclick=\"checkbox_on_change(this);\">\n";
+		//		echo "		</div>\n";
+		//	}
+		//}
+		echo "	</div>\n";
+		$x++;
+	}
+}
+
+if (permission_exists('contact_url_view')) {
+	$x = 0;
+	foreach($contact_urls as $row) {
+		echo "	<div class='form_set'>\n";
+		echo "		<div class='heading'>\n";
+		echo "			<b style='float: left;'>".$text['label-contact_url']."</b>\n";
+		if ($row['url_primary'] == "1") {
+			echo "		<i class='fas fa-star fa-xs' style='color: ".$_SESSION['theme']['input_background_color']."; float: left; margin-top: 8px; margin-left: 8px;' ' title=\"".$text['label-primary']."\"></i>\n";
+		}
+		if (permission_exists('contact_url_delete')) {
+			echo "		<div class='checkbox' style='margin-left: 8px; margin-top: 4px; float: left;'>\n";
+			echo "			<input type='checkbox' name='contact_urls[$x][checked]' id='checkbox_".$x."' class='chk_delete checkbox_urls' value='true' onclick=\"edit_delete_action('urls');\">\n";
+			echo "			<input type='hidden' name='contact_urls[$x][uuid]' value='".escape($row['contact_url_uuid'])."' />\n";
+			echo "		</div>\n";
+		}
+		echo "		</div>\n";
+		echo "		<div style='clear: both;'></div>\n";
+		echo "			<input type='hidden' name='contact_urls[$x][domain_uuid]' value=\"".escape($row["domain_uuid"])."\">\n";
+		echo "			<input type='hidden' name='contact_urls[$x][contact_uuid]' value=\"".escape($row["contact_uuid"])."\">\n";
+		echo "			<input type='hidden' name='contact_urls[$x][contact_url_uuid]' value=\"".escape($row["contact_url_uuid"])."\">\n";
+		//echo "			<td class='formfld'>\n";
+		//echo "			<div class='label'>\n";
+		//echo "				".$text['label-url_type']."\n";
+		//echo "			</div>\n";
+		//echo "			<div class='field no-wrap'>\n";
+		//echo "					<input class='formfld' type='text' name='contact_urls[$x][url_type]' placeholder='".escape($text['label-url_type'])."' maxlength='255' value=\"".escape($row["url_type"])."\">\n";
+		//echo "			</div>\n";
+		echo "			<div class='label'>\n";
+		echo "				".$text['label-url_label']."\n";
+		echo "			</div>\n";
+		echo "			<div class='field no-wrap'>\n";;
+
+		//if there are no custom labels add defaults
+		if (is_array($_SESSION["contact"]["url_label"])) {
+			$contact_url_labels = $_SESSION["contact"]["url_label"];
+		}
+		else {
+			$contact_url_labels[] = $text['option-work'];
+			$contact_url_labels[] = $text['option-personal'];
+			$contact_url_labels[] = $text['option-other'];
+		}
+		sort($contact_url_labels);
+		foreach($contact_url_labels as $label) {
+			$url_label_options[] = "<option value='".$label."' ".(($label == $row['url_label']) ? "selected='selected'" : null).">".$label."</option>";
+		}
+		$url_label_found = (in_array($url_label, $_SESSION["contact"]["url_label"])) ? true : false;
+
+		echo "				<select class='formfld' ".((!$url_label_found && $url_label != '') ? "style='display: none;'" : "style='width: auto;'")." name='contact_urls[$x][url_label]' id='url_label' onchange=\"getElementById('url_label_custom').value='';\">\n";
+		echo "					<option value=''></option>\n";
+	
+		echo 					(is_array($url_label_options)) ? implode("\n", $url_label_options) : null;
+		echo "				</select>\n";
+		echo "				<input type='text' class='formfld' ".(($url_label_found || $url_label == '') ? "style='display: none;'" : null)." name='url_label_custom' id='url_label_custom' value=\"".((!$url_label_found) ? htmlentities($url_label) : null)."\">\n";
+		//echo "				<input type='button' id='btn_toggle_label' class='btn' alt='".$text['button-back']."' value='&#9665;' onclick=\"toggle_custom('url_label');\">\n";
+		echo "			</div>\n";
+
+		echo "			<div class='label'>\n";
+		echo "				".$text['label-url_address']."\n";
+		echo "			</div>\n";
+		echo "			<div class='field no-wrap'>\n";
+
+		echo "					<input class='formfld' type='text' name='contact_urls[$x][url_address]' placeholder='http://...' maxlength='255' value=\"".escape($row["url_address"])."\">\n";
+		echo "			</div>\n";
+
+		echo "			<div class='label'>\n";
+		echo "				".$text['label-primary']."\n";
+		echo "			</div>\n";
+		echo "			<div class='field no-wrap'>\n";
+		echo "				<select class='formfld' name='contact_urls[$x][url_primary]' style='width: auto;'>\n";
+		echo "					<option value=''>".escape($text['label-url_primary'])."</option>\n";
+		if ($row['url_primary'] == "1") {
+			echo "					<option value='1' selected='selected'>".$text['label-true']."</option>\n";
+		}
+		else {
+			echo "					<option value='1'>".$text['label-true']."</option>\n";
+		}
+		if ($row['url_primary'] == "0") {
+			echo "					<option value='0' selected='selected'>".$text['label-false']."</option>\n";
+		}
+		else {
+			echo "					<option value='0'>".$text['label-false']."</option>\n";
+		}
+		echo "				</select>\n";
+		echo "			</div>\n";
+
+		echo "			<div class='label'>\n";
+		echo "				".$text['label-url_description']."\n";
+		echo "			</div>\n";
+		echo "			<div class='field no-wrap'>\n";
+		echo "				<input class='formfld' type='text' name='contact_urls[$x][url_description]' placeholder='' maxlength='255' value=\"".escape($row["url_description"])."\">\n";
+		echo "			</div>\n";
+		if (is_array($contact_urls) && @sizeof($contact_urls) > 1 && permission_exists('contact_url_delete')) {
+			if (is_uuid($row['contact_url_uuid'])) {
+				echo "			<input type='checkbox' name='contact_urls[".$x."][checked]' value='true' class='chk_delete checkbox_details' onclick=\"checkbox_on_change(this);\">\n";
+			}
+		}
+		//echo "			<br />\n";
+		//echo "			".$text['description-contact_organization']."\n";
+		echo "			<div class='label empty_row' style='grid-row: 6 / span 99;'>\n";
+		echo "				&nbsp;\n";
+		echo "			</div>\n";
+		echo "			<div class='field empty_row' style='grid-row: 6 / span 99;'>\n";
+		echo "			</div>\n";
+		echo "	</div>\n";
+		$x++;
+	}
+}
+
+if (permission_exists('contact_relation_view')) {
+	if (is_array($contact_relations)) {
+
+		$x = 0;
+		foreach($contact_relations as $row) {
+
+			$sql = "select contact_uuid, contact_organization, contact_name_given, contact_name_family from v_contacts ";
+			$sql .= "where domain_uuid = :domain_uuid ";
+			$sql .= "and contact_uuid <> :contact_uuid ";
+			$sql .= "order by contact_organization desc, contact_name_given asc, contact_name_family asc ";
+			$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+			$parameters['contact_uuid'] = $row['contact_uuid'];
+			$database = new database;
+			$contacts = $database->select($sql, $parameters, 'all');
+
+			echo "	<div class='form_set'>\n";
+			echo "		<div class='heading'>\n";
+			echo "			<b style='float: left;'>".$text['label-contact_relation_label']."</b>\n";
+			if (permission_exists('contact_relation_delete')) {
+				echo "		<div class='checkbox' style='margin-left: 8px; margin-top: 4px; float: left;'>\n";
+				echo "			<input type='checkbox' name='contact_relations[$x][checked]' id='checkbox_".$x."' class='chk_delete checkbox_relations' value='true' onclick=\"edit_delete_action('relations');\">\n";
+				echo "			<input type='hidden' name='contact_relations[$x][uuid]' value='".escape($row['contact_relation_uuid'])."' />\n";
+				echo "			<input type='hidden' name='contact_relations[$x][contact_relation_uuid]' value='".escape($row['contact_relation_uuid'])."' />\n";
+				echo "			<input type='hidden' name='contact_relations[$x][contact_uuid]' value='".escape($row['contact_uuid'])."' />\n";
+				echo "		</div>\n";
+			}
+			echo "		</div>\n";
+			echo "		<div style='clear: both;'></div>\n";
+	
+			echo "		<div class='label'>\n";
+			echo "			".$text['label-contact_relation_label']."\n";
+			echo "		</div>\n";
+			echo "		<div class='field no-wrap'>\n";
+	
+	
+			//if there are no custom labels add defaults
+			if (is_array($_SESSION["contact"]["relation_label"])) {
+				$relation_labels = $_SESSION["contact"]["url_label"];
+			}
+			else {
+				$relation_labels[] = $text['label-contact_relation_option_parent'];
+				$relation_labels[] = $text['label-contact_relation_option_child'];
+				$relation_labels[] = $text['label-contact_relation_option_employee'];
+				$relation_labels[] = $text['label-contact_relation_option_member'];
+				$relation_labels[] = $text['label-contact_relation_option_associate'];
+				$relation_labels[] = $text['label-contact_relation_option_other'];
+			}
+			sort($relation_labels);
+			foreach($relation_labels as $label) {
+				$relation_label_options[] = "<option value='".escape($label)."' ".(($label == $row['relation_label']) ? "selected='selected'" : null).">".escape($label)."</option>";
+			}
+			$relation_label_found = (in_array($relation_label, $_SESSION["contact"]["relation_label"])) ? true : false;
+			echo "			<select class='formfld' ".((!$relation_label_found && $relation_label != '') ? "style='display: none;'" : "style='auto;'")." name='contact_relations[$x][relation_label]' id='relation_label' onchange=\"getElementById('relation_label_custom').value='';\">\n";
+			echo "				<option value=''></option>\n";
+			echo 		(is_array($relation_label_options)) ? implode("\n", $relation_label_options) : null;
+			echo "			</select>\n";
+			//echo "			<input type='text' class='formfld' ".(($relation_label_found || $relation_label == '') ? "style='display: none;'" : null)." name='contact_relations[$x][relation_label_custom]' id='relation_label_custom' value=\"".((!$relation_label_found) ? htmlentities($relation_label) : null)."\">\n";
+			//echo "			<input type='button' id='btn_toggle_label' class='btn' alt='".$text['button-back']."' value='&#9665;' onclick=\"toggle_custom('relation_label');\">\n";
+			//echo "			<br />\n";
+			//echo 				$text['description-relation_label']."\n";
+			echo "		</div>\n";
+	
+	
+			echo "		<div class='label'>\n";
+			echo "			".$text['label-contact_relation_contact']."\n";
+			echo "		</div>\n";
+			echo "		<div class='field no-wrap'>\n";
+	
+			echo "			<select class='formfld' name='contact_relations[$x][relation_contact_uuid]' id='relation_contact_uuid'>\n";
+			echo "				<option value=''></option>\n";
+			if (is_array($contacts) && @sizeof($contacts) != 0) {
+				foreach($contacts as $field) {
+					$contact_name = $field['contact_name_given'].(($field['contact_name_given'] != '' && $field['contact_name_family'] != '') ? ' ' : null) . $field['contact_name_family'];
+					if ($field['contact_organization'] != '') {
+						if ($contact_name != '') {
+							$contact_name = $field['contact_organization'].', '.$contact_name;
+						}
+						else {
+							$contact_name = $field['contact_organization'];
 						}
-						echo "			</tr>\n";
 					}
+					echo "		<option value='".escape($field['contact_uuid'])."' ".(($field['contact_uuid'] == $row['relation_contact_uuid']) ? "selected='selected'" : null).">".escape($contact_name)."</option>\n";
 				}
 			}
+			unset($sql, $parameters, $result, $row);
+			echo "			</select>\n";
+			echo "		</div>\n";
+	
+			echo "		<div class='label empty_row' style='grid-row: 4 / span 99;'>\n";
+			echo "			&nbsp;\n";
+			echo "		</div>\n";
+			echo "		<div class='field no-wrap empty_row' style='grid-row: 4 / span 99;'>\n";
+			echo "		</div>\n";
+	
+			echo "	</div>\n";
+			$x++;
+		}
+	}
+}
 
-			if (permission_exists('contact_group_add')) {
-				if (is_array($contact_groups_available) && @sizeof($contact_groups_available) != 0) {
-					echo "			<tr>\n";
-					echo "				<td class='vtable' style='border-bottom: none;' colspan='2'>\n";
-					echo "					<select name='group_uuid' class='formfld' style='width: auto; margin-right: 3px;'>\n";
-					echo "						<option value=''></option>\n";
-					foreach ($contact_groups_available as $field) {
-						if ($field['group_name'] == "superadmin" && !if_group("superadmin")) { continue; }	//only show superadmin group to superadmins
-						if ($field['group_name'] == "admin" && (!if_group("superadmin") && !if_group("admin"))) { continue; }	//only show admin group to admins
-						echo "						<option value='".escape($field['group_uuid'])."'>".escape($field['group_name'])."</option>\n";
-					}
-					echo "					</select>";
-					if ($action == "update") {
-						echo button::create(['type'=>'submit','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add']]);
-					}
-					echo "				</td>\n";
-					echo "			</tr>\n";
-				}
+if (permission_exists('contact_setting_view')) {
+	$x = 0;
+	foreach($contact_settings as $row) {
+		echo "	<div class='form_set'>\n";
+		echo "		<div class='heading'>\n";
+		echo "			<b style='float: left;'>".$text['label-contact_settings']."</b>\n";
+		if (permission_exists('contact_setting_delete')) {
+			echo "		<div class='checkbox' style='margin-left: 8px; margin-top: 4px; float: left;'>\n";
+			echo "			<input type='checkbox' name='contact_settings[$x][checked]' id='checkbox_".$x."' class='chk_delete checkbox_settings' value='true' onclick=\"edit_delete_action('settings');\">\n";
+			echo "			<input type='hidden' name='contact_settings[$x][uuid]' value='".escape($row['contact_setting_uuid'])."' />\n";
+			echo "		</div>\n";
+		}
+		echo "		</div>\n";
+		echo "		<div style='clear: both;'></div>\n";
+
+		echo "		<input type='hidden' name='contact_settings[$x][domain_uuid]' value=\"".escape($row["domain_uuid"])."\">\n";
+		echo "		<input type='hidden' name='contact_settings[$x][contact_uuid]' value=\"".escape($row["contact_uuid"])."\">\n";
+		echo "		<input type='hidden' name='contact_settings[$x][contact_setting_uuid]' value=\"".escape($row["contact_setting_uuid"])."\">\n";
+
+		echo "		<div class='label vncellreq'>\n";
+		echo "			".$text['label-contact_setting_category']."\n";
+		echo "		</div>\n";
+		echo "		<div class='field no-wrap'>\n";
+		echo "				<input class='formfld' type='text' name='contact_settings[$x][contact_setting_category]'  placeholder='' maxlength='255' value=\"".escape($row["contact_setting_category"])."\">\n";
+		echo "		</div>\n";
+
+		echo "		<div class='label'>\n";
+		echo "			".$text['label-contact_setting_subcategory']."\n";
+		echo "		</div>\n";
+		echo "		<div class='field no-wrap'>\n";
+		echo "				<input class='formfld' type='text' name='contact_settings[$x][contact_setting_subcategory]' placeholder='' maxlength='255' value=\"".escape($row["contact_setting_subcategory"])."\">\n";
+		echo "		</div>\n";
+
+		echo "		<div class='label'>\n";
+		echo "			".$text['label-name']."\n";
+		echo "		</div>\n";
+		echo "		<div class='field no-wrap'>\n";
+		echo "				<input class='formfld' type='text' name='contact_settings[$x][contact_setting_name]' placeholder='' maxlength='255' value=\"".escape($row["contact_setting_name"])."\">\n";
+		echo "		</div>\n";
+
+		echo "		<div class='label'>\n";
+		echo "			".$text['label-contact_setting_value']."\n";
+		echo "		</div>\n";
+		echo "		<div class='field no-wrap'>\n";
+		echo "				<input class='formfld' type='text' name='contact_settings[$x][contact_setting_value]' placeholder='' maxlength='255' value=\"".escape($row["contact_setting_value"])."\">\n";
+		echo "		</div>\n";
+
+		echo "		<div class='label'>\n";
+		echo "			".$text['label-order']."\n";
+		echo "		</div>\n";
+		echo "		<div class='field no-wrap'>\n";
+		echo "				<select name='contact_settings[$x][contact_setting_order]' class='formfld'>\n";
+		echo "					<option value='$i' ".$selected.">".escape($text['label-contact_setting_order'])."</option>\n";
+		$i=0;
+		while ($i<=999) {
+			$selected = ($i == $row["contact_setting_order"]) ? "selected" : null;
+			if (strlen($i) == 1) {
+				echo "					<option value='00$i' ".$selected.">00$i</option>\n";
 			}
+			if (strlen($i) == 2) {
+				echo "					<option value='0$i' ".$selected.">0$i</option>\n";
+			}
+			if (strlen($i) == 3) {
+				echo "					<option value='$i' ".$selected.">$i</option>\n";
+			}
+			$i++;
+		}
+		echo "				</select>\n";
+		echo "		</div>\n";
 
-			echo "		</table>\n";
-			echo "		".$text['description-groups']."\n";
+		echo "		<div class='label vncellreq'>\n";
+		echo "			".$text['label-enabled']."\n";
+		echo "		</div>\n";
+		echo "		<div class='field no-wrap'>\n";
+		echo "				<select class='formfld' name='contact_settings[$x][contact_setting_enabled]' style='width: 5em;'>\n";
+		echo "						<option value=''><b>".escape($text['label-contact_setting_enabled'])."</b></option>\n";
+		if ($row['contact_setting_enabled'] == "true") {
+			echo "					<option value='true' selected='selected'>".$text['label-true']."</option>\n";
+		}
+		else {
+			echo "					<option value='true'>".$text['label-true']."</option>\n";
+		}
+		if ($row['contact_setting_enabled'] == "false") {
+			echo "					<option value='false' selected='selected'>".$text['label-false']."</option>\n";
+		}
+		else {
+			echo "					<option value='false'>".$text['label-false']."</option>\n";
+		}
+		echo "				</select>\n";
+		echo "		</div>\n";
 
-			echo "	</td>";
-			echo "</tr>";
+		echo "		<div class='label'>\n";
+		echo "			".$text['label-description']."\n";
+		echo "		</div>\n";
+		echo "		<div class='field no-wrap'>\n";
+		echo "				<input class='formfld' type='text' name='contact_settings[$x][contact_setting_description]' placeholder='".escape($text['label-contact_setting_description'])."' maxlength='255' value=\"".escape($row["contact_setting_description"])."\">\n";
+		echo "		</div>\n";
+	
+		if (is_array($contact_settings) && @sizeof($contact_settings) > 1 && permission_exists('contact_setting_delete')) {
+			if (is_uuid($row['contact_setting_uuid'])) {
+				echo "		<div class='label'>\n";
+				echo "			".$text['label-enabled']."\n";
+				echo "		</div>\n";
+				echo "		<div class='field no-wrap'>\n";
+				echo "			<input type='checkbox' name='contact_settings[".$x."][checked]' value='true' class='chk_delete checkbox_details' onclick=\"checkbox_on_change(this);\">\n";
+				echo "		</div>\n";
+			}
+			else {
+
+			}
 		}
 
-		echo "<tr>\n";
-		echo "	<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+		echo "		<div class='label empty_row' style='grid-row: 9 / span 99;'>\n";
+		echo "			&nbsp;\n";
+		echo "		</div>\n";
+		echo "		<div class='field no-wrap empty_row' style='grid-row: 9 / span 99;'>\n";
+		echo "		</div>\n";
+
+		echo "	</div>\n";
+		$x++;
+	}
+}
+
+if (permission_exists('contact_attachment_view')) {
+	$x = 0;
+	foreach($contact_attachments as $row) {
+		$attachment_type = strtolower(pathinfo($row['attachment_filename'], PATHINFO_EXTENSION));
+		$attachment_type_label = $attachment_type == 'jpg' || $attachment_type == 'jpeg' || $attachment_type == 'gif' || $attachment_type == 'png' ? $text['label-image'] : $text['label-file'];
+		echo "<div class='form_set'>\n";
+		echo "	<div class='heading'>\n";
+		echo " 		<b style='float: left;'>".$text['label-attachments']."</b>\n";
+		if ($row['attachment_primary'] == "1") {
+			echo "	<i class='fas fa-star fa-xs' style='color: ".$_SESSION['theme']['input_background_color']."; float: left; margin-top: 8px; margin-left: 8px;' ' title=\"".$text['label-primary']."\"></i>\n";
+		}
+		if (permission_exists('contact_attachment_delete')) {
+			echo "	<div class='checkbox' style='margin-left: 8px; margin-top: 4px; float: left;'>\n";
+			echo "		<input type='checkbox' name='contact_attachments[$x][checked]' id='checkbox_".$x."' class='chk_delete checkbox_attachments' value='true' onclick=\"edit_delete_action('attachments');\">\n";
+			echo "		<input type='hidden' name='contact_attachments[$x][uuid]' value='".escape($row['contact_attachment_uuid'])."' />\n";
+			echo "		<input type='hidden' name='contact_attachments[$x][domain_uuid]' value=\"".escape($row["domain_uuid"])."\">\n";
+			echo "		<input type='hidden' name='contact_attachments[$x][contact_attachment_uuid]' value='".escape($row['contact_attachment_uuid'])."' />\n";
+			echo "		<input type='hidden' name='contact_attachments[$x][contact_uuid]' value='".escape($row['contact_uuid'])."' />\n";
+			echo "	</div>\n";
+		}
+		echo "	</div>\n";
+		echo "	<div style='clear: both;'></div>\n";
+
+		//styles and attachment layer
+		echo "<style>\n";
+		echo "	#contact_attachment_layer {\n";
+		echo "		z-index: 999999;\n";
+		echo "		position: absolute;\n";
+		echo "		left: 0px;\n";
+		echo "		top: 0px;\n";
+		echo "		right: 0px;\n";
+		echo "		bottom: 0px;\n";
+		echo "		text-align: center;\n";
+		echo "		vertical-align: middle;\n";
+		echo "	}\n";
+		echo "</style>\n";
+		echo "<div id='contact_attachment_layer' style='display: none;'></div>\n";
+
+		//script
+		echo "<script>\n";
+		echo "	function display_attachment(id) {\n";
+		echo "		$('#contact_attachment_layer').load('contact_attachment.php?id=' + id + '&action=display', function(){\n";
+		echo "			$('#contact_attachment_layer').fadeIn(200);\n";
+		echo "		});\n";
+		echo "	}\n";
+		echo "</script>\n";
+
+		echo "	<div class='label'>\n";
+		echo "		".$text['label-attachment']."\n";
+		echo "	</div>\n";
+		echo "	<div class='field no-wrap' width='70%' class='vtable' align='left'>\n";
+		$attachment_type = strtolower(pathinfo($row['attachment_filename'], PATHINFO_EXTENSION));
+		//if ($action == 'update') {
+			echo "<input type='hidden' name='attachment_filename' value=\"".escape($row['attachment_filename'])."\">\n";
+			if ($attachment_type == 'jpg' || $attachment_type == 'jpeg' || $attachment_type == 'gif' || $attachment_type == 'png') {
+				echo "<img src='data:image/".$attachment_type.";base64,".escape($row['attachment_content'])."' style='border: none; max-width: 220px; max-height: 220px;' oncontextmenu=\"window.open('contact_attachment.php?id=".escape($row['contact_attachment_uuid'])."&action=download'); return false;\">";
+			}
+			else {
+				echo "<a href='contact_attachment.php?id=".escape($row['contact_attachment_uuid'])."&action=download' style='font-size: 120%;'>".escape($row['attachment_filename'])."</a>";
+			}
+		//}
+		//else {
+		//	$allowed_attachment_types = json_decode($_SESSION['contact']['allowed_attachment_types']['text'], true);
+		//	echo "	<input type='file' class='formfld' name='attachment' id='attachment' accept='.".implode(',.',array_keys($allowed_attachment_types))."'>\n";
+		//	echo "	<span style='display: inline-block; margin-top: 5px; font-size: 80%;'>".strtoupper(implode(', ', array_keys($allowed_attachment_types)))."</span>";
+		//}
+		echo "	</div>\n";
+
+		echo "	<div class='label'>\n";
+		echo "		".$text['label-attachment_filename']."\n";
+		echo "	</div>\n";
+		echo "	<div class='field no-wrap'>\n";
+		echo "		<a href='contact_attachment.php?id=".escape($row['contact_attachment_uuid'])."&action=download' style='font-size: 120%;'>".escape($row['attachment_filename'])."</a>";
+		echo "	</div>\n";
+
+		echo "	<div class='label'>\n";
+		echo "		".$text['label-attachment_size']."\n";
+		echo "	</div>\n";
+		echo "	<div class='field no-wrap'>\n";
+		echo 		strtoupper(byte_convert($row['attachment_size']))."\n";
+		echo "	</div>\n";
+
+		echo "	<div class='label'>\n";
+		echo "		".$text['label-primary']."\n";
+		echo "	</div>\n";
+		echo "	<div class='field no-wrap'>\n";
+		echo "		<select class='formfld' name='contact_attachments[$x][attachment_primary]' id='attachment_primary' style='width: auto;'>\n";
+		echo "			<option value='0'>".$text['option-false']."</option>\n";
+		echo "			<option value='1' ".(($row['attachment_primary']) ? "selected" : null).">".$text['option-true']."</option>\n";
+		echo "		</select>\n";
+		echo "	</div>\n";
+
+		echo "	<div class='label'>\n";
+		echo "		".$text['label-description']."\n";
+		echo "	</div>\n";
+		echo "	<div class='field no-wrap'>\n";
+		echo "		<input class='formfld' type='text' name='contact_attachments[$x][attachment_description]' maxlength='255' value=\"".escape($row['attachment_description'])."\">\n";
+		echo "	</div>\n";
+
+		echo "	<div class='label empty_row' style='grid-row: 9 / span 99;'>\n";
+		echo "		&nbsp;\n";
+		echo "	</div>\n";
+		echo "	<div class='field no-wrap empty_row' style='grid-row: 9 / span 99;'>\n";
+		echo "	</div>\n";
+
+		echo "</div>\n";
+		$x++;
+	}
+}
+
+if (permission_exists('contact_time_view')) {
+	$x = 0;
+	foreach ($contact_times as $row) {
+		echo "<div class='form_set'>\n";
+		echo "	<div class='heading'>\n";
+		echo " 		<b style='float: left;'>".$text['header_contact_times']."</b>\n";
+		if (permission_exists('contact_time_delete')) {
+			echo "	<div class='checkbox' style='margin-left: 8px; margin-top: 4px; float: left;'>\n";
+			echo "		<input type='checkbox' name='contact_times[$x][checked]' id='checkbox_".$x."' class='chk_delete checkbox_times' value='true' onclick=\"edit_delete_action('times');\">\n";
+			echo "		<input type='hidden' name='contact_times[$x][uuid]' value='".escape($row['contact_time_uuid'])."' />\n";
+			echo "		<input type='hidden' name='contact_times[$x][domain_uuid]' value=\"".escape($row["domain_uuid"])."\">\n";
+			echo "		<input type='hidden' name='contact_times[$x][contact_time_uuid]' value='".escape($row['contact_time_uuid'])."' />\n";
+			echo "		<input type='hidden' name='contact_times[$x][contact_uuid]' value='".escape($row['contact_uuid'])."' />\n";
+			echo "	</div>\n";
+		}
+		echo "	</div>\n";
+		echo "	<div style='clear: both;'></div>\n";
+
+		echo "	<div class='label'>\n";
+		echo "		".$text['label-time_start']."\n";
+		echo "	</div>\n";
+		echo "	<div class='field no-wrap'>\n";
+		echo "		<input class='formfld datetimesecpicker' data-toggle='datetimepicker' data-target='#time_start' type='text' name='contact_times[$x][time_start]' id='time_start' style='min-width: 135px; width: 135px;' value='".escape($row["time_start"])."' onblur=\"$(this).datetimepicker('hide');\">\n";
+		echo "	</div>\n";
+
+		echo "	<div class='label'>\n";
+		echo "		".$text['label-time_stop']."\n";
+		echo "	</div>\n";
+		echo "	<div class='field no-wrap'>\n";
+		echo "		<input class='formfld datetimesecpicker' data-toggle='datetimepicker' data-target='#time_stop' type='text' name='contact_times[$x][time_stop]' id='time_stop' style='min-width: 135px; width: 135px;' value='".escape($row["time_stop"])."' onblur=\"$(this).datetimepicker('hide');\">\n";
+		echo "	</div>\n";
+
+		echo "	<div class='label'>\n";
+		echo "		".$text['label-time_description']."\n";
+		echo "	</div>\n";
+		echo "	<div class='field no-wrap'>\n";
+		echo "  	<textarea class='formfld' type='text' name='contact_times[$x][time_description]' id='time_description' style='width: 100%; height: 100%;'>".escape($row["time_description"])."</textarea>\n";
+		echo "	</div>\n";
+
+		echo "	<div class='label empty_row' style='grid-row: 5 / span 99;'>\n";
+		echo "		&nbsp;\n";
+		echo "	</div>\n";
+		echo "	<div class='field empty_row' style='grid-row: 5 / span 99;'>\n";
+		echo "	</div>\n";
+
+		echo "</div>\n";
+		$x++;
+	}
+	unset($contact_times);
+}
+
+if (permission_exists('contact_note_view')) {
+	$x = 0;
+	foreach($contact_notes as $row) {
+		$contact_note = $row['contact_note'];
+		$contact_note = escape($contact_note);
+		$contact_note = str_replace("\n","<br />",$contact_note);
+		if (permission_exists('contact_note_add')) {
+			$list_row_url = "contact_note_edit.php?contact_uuid=".escape($row['contact_uuid'])."&id=".escape($row['contact_note_uuid']);
+		}
+
+		echo "<div class='form_set'>\n";
+		echo "	<div class='heading'>\n";
+		echo "		<b style='float: left;'>".$text['label-contact_notes']."</b>\n";
+		if (permission_exists('contact_note_delete')) {
+			echo "	<div class='checkbox' style='margin-left: 8px; margin-top: 4px; float: left;'>\n";
+			echo "		<input type='checkbox' name='contact_notes[$x][checked]' id='checkbox_".$x."' class='chk_delete checkbox_notes' value='true' onclick=\"edit_delete_action('notes');\">\n";
+			echo "		<input type='hidden' name='contact_notes[$x][uuid]' value='".escape($row['contact_note_uuid'])."' />\n";
+			echo "		<input type='hidden' name='contact_notes[$x][domain_uuid]' value=\"".escape($row["domain_uuid"])."\">\n";
+			echo "		<input type='hidden' name='contact_notes[$x][contact_note_uuid]' value='".escape($row['contact_note_uuid'])."' />\n";
+			echo "		<input type='hidden' name='contact_notes[$x][contact_uuid]' value='".escape($row['contact_uuid'])."' />\n";
+			echo "	</div>\n";
+		}
+		echo "	</div>\n";
+		echo "	<div style='clear: both;'></div>\n";
+
+		echo "	<div class='label'>\n";
 		echo "		".$text['label-contact_note']."\n";
-		echo "	</td>\n";
-		echo "	<td class='vtable' align='left'>\n";
-		echo "		<textarea class='formfld' style='width: 100%; height: 160px;' name='contact_note'>".$contact_note."</textarea>\n";
-		echo "	</td>\n";
-		echo "</tr>\n";
+		echo "	</div>\n";
+		echo "	<div class='field no-wrap' style='float: left;'>\n";
+		echo "  	<textarea class='formfld' name=\"contact_notes[$x][contact_note]\" style='min-width: 100%; height: 275px;'>".$contact_note."</textarea>\n";
+		echo "	</div>\n";
 
-		echo "</table>";
+		echo "	<div class='label'>\n";
+		echo "		".$text['label-note_user']."\n";
+		echo "	</div>\n";
+		echo "	<div class='field no-wrap' style='margin-top: 2px;'>\n";
+		echo "		<div class='description'><strong>".escape($row['last_mod_user'])."</strong>: ".date("j M Y @ H:i:s", strtotime($row['last_mod_date']))."</div>\n";
+		echo "	</div>\n";
 
-	echo "</td>\n";
+		echo "	<div class='label empty_row' style='grid-row: 4 / span 99;'>\n";
+		echo "		&nbsp;\n";
+		echo "	</div>\n";
+		echo "	<div class='field empty_row' style='grid-row: 4 / span 99;'>\n";
+		echo "	</div>\n";
 
-	if ($action == "update") {
-		echo "<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>";
-		echo "<td width='100%' valign='top'>\n";
-
-		if (permission_exists('contact_phone_view')) { require "contact_phones.php"; }
-		if (permission_exists('contact_address_view')) { require "contact_addresses.php"; }
-		if (permission_exists('contact_email_view')) { require "contact_emails.php"; }
-		if (permission_exists('contact_url_view')) { require "contact_urls.php"; }
-		if (permission_exists('contact_extension_view')) { require "contact_extensions.php"; }
-		if (permission_exists('contact_relation_view')) { require "contact_relations.php"; }
-		if (permission_exists('contact_note_view')) { require "contact_notes.php"; }
-		if (permission_exists('contact_time_view')) { require "contact_times.php"; }
-		if (permission_exists('contact_setting_view')) { require "contact_settings.php"; }
-		if (permission_exists('contact_attachment_view')) { require "contact_attachments.php"; }
-
-		echo "</td>\n";
+		echo "</div>\n";
+		$x++;
 	}
+	unset($contact_notes);
+}
 
-	echo "</tr>\n";
-	echo "</table>\n";
-	echo "<br><br>";
 
-	if ($action == "update") {
-		echo "<input type='hidden' name='contact_uuid' value='".escape($contact_uuid)."'>\n";
-	}
+//close the grid
+	echo "</div>\n";
+	echo "<br /><br />";
+
+//end the form
 	echo "<input type='hidden' name='".$token['name']."' value='".$token['hash']."'>\n";
 	echo "</form>";
 
-//hide the delete button when nothing to delete
-	if (
-		$action == 'update' &&
-		!permission_exists('contact_delete') && (
-		(!is_array($contact_users_assigned) || @sizeof($contact_users_assigned) == 0) &&
-		(!is_array($contact_groups_assigned) || @sizeof($contact_groups_assigned) == 0) &&
-		(!is_array($contact_phones) || @sizeof($contact_phones) == 0) &&
-		(!is_array($contact_addresses) || @sizeof($contact_addresses) == 0) &&
-		(!is_array($contact_emails) || @sizeof($contact_emails) == 0) &&
-		(!is_array($contact_urls) || @sizeof($contact_urls) == 0) &&
-		(!is_array($contact_extensions) || @sizeof($contact_extensions) == 0) &&
-		(!is_array($contact_relations) || @sizeof($contact_relations) == 0) &&
-		(!is_array($contact_notes) || @sizeof($contact_notes) == 0) &&
-		(!is_array($contact_times) || @sizeof($contact_times) == 0) &&
-		(!is_array($contact_settings) || @sizeof($contact_settings) == 0) &&
-		(!is_array($contact_attachments) || @sizeof($contact_attachments) == 0)
-		)) {
-		echo "<script>document.getElementsByName('btn_delete')[0].style.display='none';</script>\n";
-	}
-
 //include the footer
 	require_once "resources/footer.php";
 
-?>
\ No newline at end of file
+?>