Просмотр исходного кода

Add contact_category, phone_description, and address_description to the contacts tool.

Mark Crane 12 лет назад
Родитель
Сommit
b6e3c0628d
7 измененных файлов с 379 добавлено и 210 удалено
  1. 25 2
      app_config.php
  2. 4 0
      contact_addresses.php
  3. 58 26
      contact_addresses_edit.php
  4. 3 1
      contact_phones.php
  5. 133 101
      contact_phones_edit.php
  6. 5 1
      contacts.php
  7. 151 79
      contacts_edit.php

+ 25 - 2
app_config.php

@@ -116,6 +116,10 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the role.';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the role.';
 		$z++;
 		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'contact_category';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the category.';
+		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'contact_email';
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'contact_email';
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the email address.';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the email address.';
@@ -132,6 +136,13 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the notes.';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the notes.';
 		$z++;
 		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'created';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Date when the contact was created.';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'created_by';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'The user that created the contact.';
 
 
 		$y = 1; //table array index
 		$y = 1; //table array index
 		$apps[$x]['db'][$y]['table'] = 'v_contact_addresses';
 		$apps[$x]['db'][$y]['table'] = 'v_contact_addresses';
@@ -160,6 +171,10 @@
 		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = 'contact_uuid';
 		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = 'contact_uuid';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
 		$z++;
 		$z++;
+		//$apps[$x]['db'][$y]['fields'][$z]['name'] = 'address_name';
+		//$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		//$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the address name.';
+		//$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'address_type';
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'address_type';
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the address type.';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the address type.';
@@ -190,11 +205,15 @@
 		$z++;
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'address_latitude';
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'address_latitude';
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the latitude';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the latitude.';
 		$z++;
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'address_longitude';
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'address_longitude';
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the longitude';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the longitude.';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'address_description';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the description.';
 		$z++;
 		$z++;
 
 
 		$y = 2; //table array index
 		$y = 2; //table array index
@@ -236,6 +255,10 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the extension.';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the extension.';
 		$z++;
 		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'phone_description';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the description.';
+		$z++;
 
 
 		$y = 3; //table array index
 		$y = 3; //table array index
 		$apps[$x]['db'][$y]['table'] = 'v_contact_notes';
 		$apps[$x]['db'][$y]['table'] = 'v_contact_notes';

+ 4 - 0
contact_addresses.php

@@ -104,6 +104,7 @@ require_once "includes/paging.php";
 	echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 	echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 
 
 	echo "<tr>\n";
 	echo "<tr>\n";
+	//echo th_order_by('address_name', 'Name', $order_by, $order);
 	echo th_order_by('address_type', 'Type', $order_by, $order);
 	echo th_order_by('address_type', 'Type', $order_by, $order);
 	//echo th_order_by('address_street', 'Street Address', $order_by, $order);
 	//echo th_order_by('address_street', 'Street Address', $order_by, $order);
 	//echo th_order_by('address_extended', 'Extended Address', $order_by, $order);
 	//echo th_order_by('address_extended', 'Extended Address', $order_by, $order);
@@ -114,6 +115,7 @@ require_once "includes/paging.php";
 	//echo th_order_by('address_latitude', 'Latitude', $order_by, $order);
 	//echo th_order_by('address_latitude', 'Latitude', $order_by, $order);
 	//echo th_order_by('address_longitude', 'Longitude', $order_by, $order);
 	//echo th_order_by('address_longitude', 'Longitude', $order_by, $order);
 	echo "<th>Tools</th>\n";
 	echo "<th>Tools</th>\n";
+	echo th_order_by('address_description', 'Description', $order_by, $order);
 	echo "<td align='right' width='42'>\n";
 	echo "<td align='right' width='42'>\n";
 	echo "	<a href='contact_addresses_edit.php?contact_uuid=".$_GET['id']."' alt='add'>$v_link_label_add</a>\n";
 	echo "	<a href='contact_addresses_edit.php?contact_uuid=".$_GET['id']."' alt='add'>$v_link_label_add</a>\n";
 	echo "</td>\n";
 	echo "</td>\n";
@@ -123,6 +125,7 @@ require_once "includes/paging.php";
 		foreach($result as $row) {
 		foreach($result as $row) {
 			$map_query = $row['address_street']." ".$row['address_extended'].", ".$row['address_locality'].", ".$row['address_region'].", ".$row['address_region'].", ".$row['address_postal_code'];
 			$map_query = $row['address_street']." ".$row['address_extended'].", ".$row['address_locality'].", ".$row['address_region'].", ".$row['address_region'].", ".$row['address_postal_code'];
 			echo "<tr >\n";
 			echo "<tr >\n";
+			//echo "	<td valign='top' class='".$row_style[$c]."'>".$row['address_name']."&nbsp;</td>\n";
 			echo "	<td valign='top' class='".$row_style[$c]."'>".$row['address_type']."&nbsp;</td>\n";
 			echo "	<td valign='top' class='".$row_style[$c]."'>".$row['address_type']."&nbsp;</td>\n";
 			//echo "	<td valign='top' class='".$row_style[$c]."'>".$row['address_street']."&nbsp;</td>\n";
 			//echo "	<td valign='top' class='".$row_style[$c]."'>".$row['address_street']."&nbsp;</td>\n";
 			//echo "	<td valign='top' class='".$row_style[$c]."'>".$row['address_extended']."&nbsp;</td>\n";
 			//echo "	<td valign='top' class='".$row_style[$c]."'>".$row['address_extended']."&nbsp;</td>\n";
@@ -135,6 +138,7 @@ require_once "includes/paging.php";
 			echo "	<td valign='top' class='".$row_style[$c]."'>\n";
 			echo "	<td valign='top' class='".$row_style[$c]."'>\n";
 			echo "		<a href=\"http://maps.google.com/maps?q=".urlencode($map_query)."&hl=en\" target=\"_blank\">Map</a>&nbsp;\n";
 			echo "		<a href=\"http://maps.google.com/maps?q=".urlencode($map_query)."&hl=en\" target=\"_blank\">Map</a>&nbsp;\n";
 			echo "	</td>\n";
 			echo "	</td>\n";
+			echo "	<td valign='top' class='".$row_style[$c]."'>".$row['address_description']."&nbsp;</td>\n";
 			echo "	<td valign='top' align='right'>\n";
 			echo "	<td valign='top' align='right'>\n";
 			echo "		<a href='contact_addresses_edit.php?contact_uuid=".$row['contact_uuid']."&id=".$row['contact_address_uuid']."' alt='edit'>$v_link_label_edit</a>\n";
 			echo "		<a href='contact_addresses_edit.php?contact_uuid=".$row['contact_uuid']."&id=".$row['contact_address_uuid']."' alt='edit'>$v_link_label_edit</a>\n";
 			echo "		<a href='contact_addresses_delete.php?contact_uuid=".$row['contact_uuid']."&id=".$row['contact_address_uuid']."' alt='delete' onclick=\"return confirm('Do you really want to delete this?')\">$v_link_label_delete</a>\n";
 			echo "		<a href='contact_addresses_delete.php?contact_uuid=".$row['contact_uuid']."&id=".$row['contact_address_uuid']."' alt='delete' onclick=\"return confirm('Do you really want to delete this?')\">$v_link_label_delete</a>\n";

+ 58 - 26
contact_addresses_edit.php

@@ -49,6 +49,7 @@ if (strlen($_GET["contact_uuid"]) > 0) {
 
 
 //get http post variables and set them to php variables
 //get http post variables and set them to php variables
 	if (count($_POST)>0) {
 	if (count($_POST)>0) {
+		//$address_name = check_str($_POST["address_name"]);
 		$address_type = check_str($_POST["address_type"]);
 		$address_type = check_str($_POST["address_type"]);
 		$address_street = check_str($_POST["address_street"]);
 		$address_street = check_str($_POST["address_street"]);
 		$address_extended = check_str($_POST["address_extended"]);
 		$address_extended = check_str($_POST["address_extended"]);
@@ -58,6 +59,7 @@ if (strlen($_GET["contact_uuid"]) > 0) {
 		$address_country = check_str($_POST["address_country"]);
 		$address_country = check_str($_POST["address_country"]);
 		$address_latitude = check_str($_POST["address_latitude"]);
 		$address_latitude = check_str($_POST["address_latitude"]);
 		$address_longitude = check_str($_POST["address_longitude"]);
 		$address_longitude = check_str($_POST["address_longitude"]);
+		$address_description = check_str($_POST["address_description"]);
 	}
 	}
 
 
 if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
@@ -100,6 +102,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			$sql .= "domain_uuid, ";
 			$sql .= "domain_uuid, ";
 			$sql .= "contact_uuid, ";
 			$sql .= "contact_uuid, ";
 			$sql .= "contact_address_uuid, ";
 			$sql .= "contact_address_uuid, ";
+			//$sql .= "address_name, ";
 			$sql .= "address_type, ";
 			$sql .= "address_type, ";
 			$sql .= "address_street, ";
 			$sql .= "address_street, ";
 			$sql .= "address_extended, ";
 			$sql .= "address_extended, ";
@@ -108,13 +111,15 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			$sql .= "address_postal_code, ";
 			$sql .= "address_postal_code, ";
 			$sql .= "address_country, ";
 			$sql .= "address_country, ";
 			$sql .= "address_latitude, ";
 			$sql .= "address_latitude, ";
-			$sql .= "address_longitude ";
+			$sql .= "address_longitude, ";
+			$sql .= "address_description ";
 			$sql .= ")";
 			$sql .= ")";
 			$sql .= "values ";
 			$sql .= "values ";
 			$sql .= "(";
 			$sql .= "(";
 			$sql .= "'".$_SESSION['domain_uuid']."', ";
 			$sql .= "'".$_SESSION['domain_uuid']."', ";
 			$sql .= "'$contact_uuid', ";
 			$sql .= "'$contact_uuid', ";
 			$sql .= "'$contact_address_uuid', ";
 			$sql .= "'$contact_address_uuid', ";
+			//$sql .= "'$address_name', ";
 			$sql .= "'$address_type', ";
 			$sql .= "'$address_type', ";
 			$sql .= "'$address_street', ";
 			$sql .= "'$address_street', ";
 			$sql .= "'$address_extended', ";
 			$sql .= "'$address_extended', ";
@@ -123,7 +128,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			$sql .= "'$address_postal_code', ";
 			$sql .= "'$address_postal_code', ";
 			$sql .= "'$address_country', ";
 			$sql .= "'$address_country', ";
 			$sql .= "'$address_latitude', ";
 			$sql .= "'$address_latitude', ";
-			$sql .= "'$address_longitude' ";
+			$sql .= "'$address_longitude', ";
+			$sql .= "'$address_description' ";
 			$sql .= ")";
 			$sql .= ")";
 			$db->exec(check_sql($sql));
 			$db->exec(check_sql($sql));
 			unset($sql);
 			unset($sql);
@@ -140,6 +146,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		if ($action == "update") {
 		if ($action == "update") {
 			$sql = "update v_contact_addresses set ";
 			$sql = "update v_contact_addresses set ";
 			$sql .= "contact_uuid = '$contact_uuid', ";
 			$sql .= "contact_uuid = '$contact_uuid', ";
+			//$sql .= "address_name = '$address_name', ";
 			$sql .= "address_type = '$address_type', ";
 			$sql .= "address_type = '$address_type', ";
 			$sql .= "address_street = '$address_street', ";
 			$sql .= "address_street = '$address_street', ";
 			$sql .= "address_extended = '$address_extended', ";
 			$sql .= "address_extended = '$address_extended', ";
@@ -148,8 +155,9 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			$sql .= "address_postal_code = '$address_postal_code', ";
 			$sql .= "address_postal_code = '$address_postal_code', ";
 			$sql .= "address_country = '$address_country', ";
 			$sql .= "address_country = '$address_country', ";
 			$sql .= "address_latitude = '$address_latitude', ";
 			$sql .= "address_latitude = '$address_latitude', ";
-			$sql .= "address_longitude = '$address_longitude' ";
-			$sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."'";
+			$sql .= "address_longitude = '$address_longitude', ";
+			$sql .= "address_description = '$address_description' ";
+			$sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' ";
 			$sql .= "and contact_address_uuid = '$contact_address_uuid'";
 			$sql .= "and contact_address_uuid = '$contact_address_uuid'";
 			$db->exec(check_sql($sql));
 			$db->exec(check_sql($sql));
 			unset($sql);
 			unset($sql);
@@ -168,14 +176,14 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 //pre-populate the form
 //pre-populate the form
 	if (count($_GET)>0 && $_POST["persistformvar"] != "true") {
 	if (count($_GET)>0 && $_POST["persistformvar"] != "true") {
 		$contact_address_uuid = $_GET["id"];
 		$contact_address_uuid = $_GET["id"];
-		$sql = "";
-		$sql .= "select * from v_contact_addresses ";
+		$sql = "select * from v_contact_addresses ";
 		$sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' ";
 		$sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' ";
 		$sql .= "and contact_address_uuid = '$contact_address_uuid' ";
 		$sql .= "and contact_address_uuid = '$contact_address_uuid' ";
 		$prep_statement = $db->prepare(check_sql($sql));
 		$prep_statement = $db->prepare(check_sql($sql));
 		$prep_statement->execute();
 		$prep_statement->execute();
 		$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
 		$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
 		foreach ($result as &$row) {
 		foreach ($result as &$row) {
+			//$address_name = $row["address_name"];
 			$address_type = $row["address_type"];
 			$address_type = $row["address_type"];
 			$address_street = $row["address_street"];
 			$address_street = $row["address_street"];
 			$address_extended = $row["address_extended"];
 			$address_extended = $row["address_extended"];
@@ -185,6 +193,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			$address_country = $row["address_country"];
 			$address_country = $row["address_country"];
 			$address_latitude = $row["address_latitude"];
 			$address_latitude = $row["address_latitude"];
 			$address_longitude = $row["address_longitude"];
 			$address_longitude = $row["address_longitude"];
+			$address_description = $row["address_description"];
 			break; //limit to 1 row
 			break; //limit to 1 row
 		}
 		}
 		unset ($prep_statement);
 		unset ($prep_statement);
@@ -198,18 +207,13 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "<table width='100%' border='0' cellpadding='0' cellspacing=''>\n";
 	echo "<table width='100%' border='0' cellpadding='0' cellspacing=''>\n";
 	echo "<tr class='border'>\n";
 	echo "<tr class='border'>\n";
 	echo "	<td align=\"left\">\n";
 	echo "	<td align=\"left\">\n";
-	echo "	  <br>";
+	echo "		<br>";
 
 
 	echo "<form method='post' name='frm' action=''>\n";
 	echo "<form method='post' name='frm' action=''>\n";
 	echo "<div align='center'>\n";
 	echo "<div align='center'>\n";
 	echo "<table width='100%'  border='0' cellpadding='6' cellspacing='0'>\n";
 	echo "<table width='100%'  border='0' cellpadding='6' cellspacing='0'>\n";
 	echo "<tr>\n";
 	echo "<tr>\n";
-	if ($action == "add") {
-		echo "<td align='left' width='30%' nowrap='nowrap'><b>Contacts Address Add</b></td>\n";
-	}
-	if ($action == "update") {
-		echo "<td align='left' width='30%' nowrap='nowrap'><b>Contacts Address Edit</b></td>\n";
-	}
+	echo "<td align='left' width='30%' nowrap='nowrap'><b>Contact Address</b></td>\n";
 	echo "<td width='70%' align='right'><input type='button' class='btn' name='' alt='back' onclick=\"window.location='contacts_edit.php?id=$contact_uuid'\" value='Back'></td>\n";
 	echo "<td width='70%' align='right'><input type='button' class='btn' name='' alt='back' onclick=\"window.location='contacts_edit.php?id=$contact_uuid'\" value='Back'></td>\n";
 	echo "</tr>\n";
 	echo "</tr>\n";
 	echo "<tr>\n";
 	echo "<tr>\n";
@@ -220,24 +224,40 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 
 
 	echo "<tr>\n";
 	echo "<tr>\n";
 	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
 	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
-	echo "	Address Type:\n";
+	echo "	Type:\n";
 	echo "</td>\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
 	echo "<td class='vtable' align='left'>\n";
-	echo "	<select class='formfld' name='address_type'>\n";
-	echo "	<option value=''></option>\n";
-	if (strtolower($address_type) == "home") { 
-		echo "	<option value='home' selected='selected'>home</option>\n";
-	}
-	else {
-		echo "	<option value='home'>home</option>\n";
-	}
-	if (strtolower($address_type) == "work") { 
-		echo "	<option value='work' selected='selected'>work</option>\n";
+	if (is_array($_SESSION["contact"]["address_type"])) {
+		sort($_SESSION["contact"]["address_type"]);
+		echo "	<select class='formfld' style='width:85%;' name='address_type'>\n";
+		echo "	<option value=''></option>\n";
+		foreach($_SESSION["contact"]["address_type"] as $row) {
+			if ($row == $address_type) { 
+				echo "	<option value='".$row."' selected='selected'>".$row."</option>\n";
+			}
+			else {
+				echo "	<option value='".$row."'>".$row."</option>\n";
+			}
+		}
+		echo "	</select>\n";
 	}
 	}
 	else {
 	else {
-		echo "	<option value='work'>work</option>\n";
+		echo "	<select class='formfld' name='address_type'>\n";
+		echo "	<option value=''></option>\n";
+		if (strtolower($address_type) == "home") { 
+			echo "	<option value='home' selected='selected'>home</option>\n";
+		}
+		else {
+			echo "	<option value='home'>home</option>\n";
+		}
+		if (strtolower($address_type) == "work") { 
+			echo "	<option value='work' selected='selected'>work</option>\n";
+		}
+		else {
+			echo "	<option value='work'>work</option>\n";
+		}
+		echo "	</select>\n";
 	}
 	}
-	echo "	</select>\n";
 	echo "<br />\n";
 	echo "<br />\n";
 	echo "Enter the address type.\n";
 	echo "Enter the address type.\n";
 	echo "</td>\n";
 	echo "</td>\n";
@@ -330,6 +350,18 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "Enter the longitude\n";
 	echo "Enter the longitude\n";
 	echo "</td>\n";
 	echo "</td>\n";
 	echo "</tr>\n";
 	echo "</tr>\n";
+
+	echo "<tr>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	Description:\n";
+	echo "</td>\n";
+	echo "<td class='vtable' align='left'>\n";
+	echo "	<input class='formfld' type='text' name='address_description' maxlength='255' value=\"$address_description\">\n";
+	echo "<br />\n";
+	echo "Enter the description.\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
 	echo "	<tr>\n";
 	echo "	<tr>\n";
 	echo "		<td colspan='2' align='right'>\n";
 	echo "		<td colspan='2' align='right'>\n";
 	echo "				<input type='hidden' name='contact_uuid' value='$contact_uuid'>\n";
 	echo "				<input type='hidden' name='contact_uuid' value='$contact_uuid'>\n";

+ 3 - 1
contact_phones.php

@@ -121,6 +121,7 @@ require_once "includes/paging.php";
 	echo th_order_by('phone_type', 'Type', $order_by, $order);
 	echo th_order_by('phone_type', 'Type', $order_by, $order);
 	echo th_order_by('phone_number', 'Numbers', $order_by, $order);
 	echo th_order_by('phone_number', 'Numbers', $order_by, $order);
 	echo "<th>Tools</th>\n";
 	echo "<th>Tools</th>\n";
+	echo th_order_by('phone_description', 'Description', $order_by, $order);
 	echo "<td align='right' width='42'>\n";
 	echo "<td align='right' width='42'>\n";
 	echo "	<a href='contact_phones_edit.php?contact_uuid=".$_GET['id']."' alt='add'>$v_link_label_add</a>\n";
 	echo "	<a href='contact_phones_edit.php?contact_uuid=".$_GET['id']."' alt='add'>$v_link_label_add</a>\n";
 	echo "</td>\n";
 	echo "</td>\n";
@@ -139,6 +140,7 @@ require_once "includes/paging.php";
 			echo "		<a href=\"".PROJECT_PATH."/app/xml_cdr/xml_cdr.php?caller_id_number=".$row['phone_number']."&destination_number=".$row['phone_number']."\">CDR</a>\n";
 			echo "		<a href=\"".PROJECT_PATH."/app/xml_cdr/xml_cdr.php?caller_id_number=".$row['phone_number']."&destination_number=".$row['phone_number']."\">CDR</a>\n";
 			echo "		&nbsp;\n";
 			echo "		&nbsp;\n";
 			echo "	</td>\n";
 			echo "	</td>\n";
+			echo "	<td valign='top' class='".$row_style[$c]."'>".$row['phone_description']."&nbsp;</td>\n";
 			echo "	<td valign='top' align='right'>\n";
 			echo "	<td valign='top' align='right'>\n";
 			echo "		<a href='contact_phones_edit.php?contact_uuid=".$row['contact_uuid']."&id=".$row['contact_phone_uuid']."' alt='edit'>$v_link_label_edit</a>\n";
 			echo "		<a href='contact_phones_edit.php?contact_uuid=".$row['contact_uuid']."&id=".$row['contact_phone_uuid']."' alt='edit'>$v_link_label_edit</a>\n";
 			echo "		<a href='contact_phones_delete.php?contact_uuid=".$row['contact_uuid']."&id=".$row['contact_phone_uuid']."' alt='delete' onclick=\"return confirm('Do you really want to delete this?')\">$v_link_label_delete</a>\n";
 			echo "		<a href='contact_phones_delete.php?contact_uuid=".$row['contact_uuid']."&id=".$row['contact_phone_uuid']."' alt='delete' onclick=\"return confirm('Do you really want to delete this?')\">$v_link_label_delete</a>\n";
@@ -150,7 +152,7 @@ require_once "includes/paging.php";
 	} //end if results
 	} //end if results
 
 
 	echo "<tr>\n";
 	echo "<tr>\n";
-	echo "<td colspan='4' align='left'>\n";
+	echo "<td colspan='5' align='left'>\n";
 	echo "	<table width='100%' cellpadding='0' cellspacing='0'>\n";
 	echo "	<table width='100%' cellpadding='0' cellspacing='0'>\n";
 	echo "	<tr>\n";
 	echo "	<tr>\n";
 	echo "		<td width='33.3%' nowrap>&nbsp;</td>\n";
 	echo "		<td width='33.3%' nowrap>&nbsp;</td>\n";

+ 133 - 101
contact_phones_edit.php

@@ -52,6 +52,7 @@ if (strlen($_GET["contact_uuid"]) > 0) {
 		$phone_type = check_str($_POST["phone_type"]);
 		$phone_type = check_str($_POST["phone_type"]);
 		$phone_number = check_str($_POST["phone_number"]);
 		$phone_number = check_str($_POST["phone_number"]);
 		$phone_extension = check_str($_POST["phone_extension"]);
 		$phone_extension = check_str($_POST["phone_extension"]);
+		$phone_description = check_str($_POST["phone_description"]);
 
 
 		//remove any phone number formatting
 		//remove any phone number formatting
 		$phone_number = preg_replace('{\D}', '', $phone_number);
 		$phone_number = preg_replace('{\D}', '', $phone_number);
@@ -92,7 +93,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			$sql .= "contact_phone_uuid, ";
 			$sql .= "contact_phone_uuid, ";
 			$sql .= "phone_type, ";
 			$sql .= "phone_type, ";
 			$sql .= "phone_number, ";
 			$sql .= "phone_number, ";
-			$sql .= "phone_extension ";
+			$sql .= "phone_extension, ";
+			$sql .= "phone_description ";
 			$sql .= ")";
 			$sql .= ")";
 			$sql .= "values ";
 			$sql .= "values ";
 			$sql .= "(";
 			$sql .= "(";
@@ -101,7 +103,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			$sql .= "'$contact_phone_uuid', ";
 			$sql .= "'$contact_phone_uuid', ";
 			$sql .= "'$phone_type', ";
 			$sql .= "'$phone_type', ";
 			$sql .= "'$phone_number', ";
 			$sql .= "'$phone_number', ";
-			$sql .= "'$phone_extension' ";
+			$sql .= "'$phone_extension', ";
+			$sql .= "'$phone_description' ";
 			$sql .= ")";
 			$sql .= ")";
 			$db->exec(check_sql($sql));
 			$db->exec(check_sql($sql));
 			unset($sql);
 			unset($sql);
@@ -120,7 +123,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			$sql .= "contact_uuid = '$contact_uuid', ";
 			$sql .= "contact_uuid = '$contact_uuid', ";
 			$sql .= "phone_type = '$phone_type', ";
 			$sql .= "phone_type = '$phone_type', ";
 			$sql .= "phone_number = '$phone_number', ";
 			$sql .= "phone_number = '$phone_number', ";
-			$sql .= "phone_extension = '$phone_extension' ";
+			$sql .= "phone_extension = '$phone_extension', ";
+			$sql .= "phone_description = '$phone_description' ";
 			$sql .= "where domain_uuid = '$domain_uuid'";
 			$sql .= "where domain_uuid = '$domain_uuid'";
 			$sql .= "and contact_phone_uuid = '$contact_phone_uuid'";
 			$sql .= "and contact_phone_uuid = '$contact_phone_uuid'";
 			$db->exec(check_sql($sql));
 			$db->exec(check_sql($sql));
@@ -150,6 +154,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			$phone_type = $row["phone_type"];
 			$phone_type = $row["phone_type"];
 			$phone_number = $row["phone_number"];
 			$phone_number = $row["phone_number"];
 			$phone_extension = $row["phone_extension"];
 			$phone_extension = $row["phone_extension"];
+			$phone_description = $row["phone_description"];
 		}
 		}
 		unset ($prep_statement);
 		unset ($prep_statement);
 	}
 	}
@@ -168,7 +173,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "<div align='center'>\n";
 	echo "<div align='center'>\n";
 	echo "<table width='100%' align='left' border='0' cellpadding='6' cellspacing='0'>\n";
 	echo "<table width='100%' align='left' border='0' cellpadding='6' cellspacing='0'>\n";
 	echo "<tr>\n";
 	echo "<tr>\n";
-	echo "<td align='left' width='30%' nowrap='nowrap'><b>Contacts Phone</b></td>\n";
+	echo "<td align='left' width='30%' nowrap='nowrap'><b>Contact Phone</b></td>\n";
 	echo "<td width='70%' align='right'><input type='button' class='btn' name='' alt='back' onclick=\"window.location='contacts_edit.php?id=$contact_uuid'\" value='Back'></td>\n";
 	echo "<td width='70%' align='right'><input type='button' class='btn' name='' alt='back' onclick=\"window.location='contacts_edit.php?id=$contact_uuid'\" value='Back'></td>\n";
 	echo "</tr>\n";
 	echo "</tr>\n";
 	echo "<tr>\n";
 	echo "<tr>\n";
@@ -179,108 +184,124 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 
 
 	echo "<tr>\n";
 	echo "<tr>\n";
 	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
 	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
-	echo "	Type.:\n";
+	echo "	Type:\n";
 	echo "</td>\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
 	echo "<td class='vtable' align='left'>\n";
-	echo "	<select class='formfld' name='phone_type'>\n";
-	echo "	<option value=''></option>\n";
-	if ($phone_type == "home") { 
-		echo "	<option value='home' SELECTED >Home</option>\n";
-	}
-	else {
-		echo "	<option value='home'>Home</option>\n";
-	}
-	if ($phone_type == "work") { 
-		echo "	<option value='work' SELECTED >Work</option>\n";
-	}
-	else {
-		echo "	<option value='work'>Work</option>\n";
-	}
-	if ($phone_type == "pref") { 
-		echo "	<option value='pref' SELECTED >Pref</option>\n";
-	}
-	else {
-		echo "	<option value='pref'>Pref</option>\n";
-	}
-	if ($phone_type == "voice") { 
-		echo "	<option value='voice' SELECTED >Voice</option>\n";
-	}
-	else {
-		echo "	<option value='voice'>Voice</option>\n";
-	}
-	if ($phone_type == "fax") { 
-		echo "	<option value='fax' SELECTED >Fax</option>\n";
-	}
-	else {
-		echo "	<option value='fax'>Fax</option>\n";
-	}
-	if ($phone_type == "msg") { 
-		echo "	<option value='msg' SELECTED >MSG</option>\n";
-	}
-	else {
-		echo "	<option value='msg'>MSG</option>\n";
-	}
-	if ($phone_type == "cell") { 
-		echo "	<option value='cell' SELECTED >Cell</option>\n";
-	}
-	else {
-		echo "	<option value='cell'>Cell</option>\n";
-	}
-	if ($phone_type == "pager") { 
-		echo "	<option value='pager' SELECTED >Pager</option>\n";
-	}
-	else {
-		echo "	<option value='pager'>Pager</option>\n";
-	}
-	if ($phone_type == "bbs") { 
-		echo "	<option value='bbs' SELECTED >BBS</option>\n";
-	}
-	else {
-		echo "	<option value='bbs'>BBS</option>\n";
-	}
-	if ($phone_type == "modem") { 
-		echo "	<option value='modem' SELECTED >Modem</option>\n";
-	}
-	else {
-		echo "	<option value='modem'>Modem</option>\n";
-	}
-	if ($phone_type == "car") { 
-		echo "	<option value='car' SELECTED >Car</option>\n";
-	}
-	else {
-		echo "	<option value='car'>Car</option>\n";
-	}
-	if ($phone_type == "isdn") { 
-		echo "	<option value='isdn' SELECTED >ISDN</option>\n";
-	}
-	else {
-		echo "	<option value='isdn'>ISDN</option>\n";
-	}
-	if ($phone_type == "video") { 
-		echo "	<option value='video' SELECTED >Video</option>\n";
-	}
-	else {
-		echo "	<option value='video'>Video</option>\n";
-	}
-	if ($phone_type == "pcs") { 
-		echo "	<option value='pcs' SELECTED >PCS</option>\n";
-	}
-	else {
-		echo "	<option value='pcs'>PCS</option>\n";
-	}
-	if ($phone_type == "iana-token") { 
-		echo "	<option value='iana-token' SELECTED >iana-token</option>\n";
-	}
-	else {
-		echo "	<option value='iana-token'>iana-token</option>\n";
-	}
-	if ($phone_type == "x-name") { 
-		echo "	<option value='x-name' SELECTED >x-name</option>\n";
+	if (is_array($_SESSION["contact"]["phone_type"])) {
+		sort($_SESSION["contact"]["phone_type"]);
+		echo "	<select class='formfld' style='width:85%;' name='phone_type'>\n";
+		echo "	<option value=''></option>\n";
+		foreach($_SESSION["contact"]["phone_type"] as $row) {
+			if ($row == $phone_type) { 
+				echo "	<option value='".$row."' selected='selected'>".$row."</option>\n";
+			}
+			else {
+				echo "	<option value='".$row."'>".$row."</option>\n";
+			}
+		}
+		echo "	</select>\n";
 	}
 	}
 	else {
 	else {
-		echo "	<option value='x-name'>x-name</option>\n";
+		echo "	<select class='formfld' name='phone_type'>\n";
+		echo "	<option value=''></option>\n";
+		if ($phone_type == "home") { 
+			echo "	<option value='home' selected='selected'>Home</option>\n";
+		}
+		else {
+			echo "	<option value='home'>Home</option>\n";
+		}
+		if ($phone_type == "work") { 
+			echo "	<option value='work' selected='selected'>Work</option>\n";
+		}
+		else {
+			echo "	<option value='work'>Work</option>\n";
+		}
+		if ($phone_type == "pref") { 
+			echo "	<option value='pref' selected='selected'>Pref</option>\n";
+		}
+		else {
+			echo "	<option value='pref'>Pref</option>\n";
+		}
+		if ($phone_type == "voice") { 
+			echo "	<option value='voice' selected='selected'>Voice</option>\n";
+		}
+		else {
+			echo "	<option value='voice'>Voice</option>\n";
+		}
+		if ($phone_type == "fax") { 
+			echo "	<option value='fax' selected='selected'>Fax</option>\n";
+		}
+		else {
+			echo "	<option value='fax'>Fax</option>\n";
+		}
+		if ($phone_type == "msg") { 
+			echo "	<option value='msg' selected='selected'>MSG</option>\n";
+		}
+		else {
+			echo "	<option value='msg'>MSG</option>\n";
+		}
+		if ($phone_type == "cell") { 
+			echo "	<option value='cell' selected='selected'>Cell</option>\n";
+		}
+		else {
+			echo "	<option value='cell'>Cell</option>\n";
+		}
+		if ($phone_type == "pager") { 
+			echo "	<option value='pager' selected='selected'>Pager</option>\n";
+		}
+		else {
+			echo "	<option value='pager'>Pager</option>\n";
+		}
+		if ($phone_type == "bbs") { 
+			echo "	<option value='bbs' selected='selected'>BBS</option>\n";
+		}
+		else {
+			echo "	<option value='bbs'>BBS</option>\n";
+		}
+		if ($phone_type == "modem") { 
+			echo "	<option value='modem' selected='selected'>Modem</option>\n";
+		}
+		else {
+			echo "	<option value='modem'>Modem</option>\n";
+		}
+		if ($phone_type == "car") { 
+			echo "	<option value='car' selected='selected'>Car</option>\n";
+		}
+		else {
+			echo "	<option value='car'>Car</option>\n";
+		}
+		if ($phone_type == "isdn") { 
+			echo "	<option value='isdn' selected='selected'>ISDN</option>\n";
+		}
+		else {
+			echo "	<option value='isdn'>ISDN</option>\n";
+		}
+		if ($phone_type == "video") { 
+			echo "	<option value='video' selected='selected'>Video</option>\n";
+		}
+		else {
+			echo "	<option value='video'>Video</option>\n";
+		}
+		if ($phone_type == "pcs") { 
+			echo "	<option value='pcs' selected='selected'>PCS</option>\n";
+		}
+		else {
+			echo "	<option value='pcs'>PCS</option>\n";
+		}
+		if ($phone_type == "iana-token") { 
+			echo "	<option value='iana-token' selected='selected'>iana-token</option>\n";
+		}
+		else {
+			echo "	<option value='iana-token'>iana-token</option>\n";
+		}
+		if ($phone_type == "x-name") { 
+			echo "	<option value='x-name' selected='selected'>x-name</option>\n";
+		}
+		else {
+			echo "	<option value='x-name'>x-name</option>\n";
+		}
+		echo "	</select>\n";
 	}
 	}
-	echo "	</select>\n";
 	echo "<br />\n";
 	echo "<br />\n";
 	echo "Enter the phone type.\n";
 	echo "Enter the phone type.\n";
 	echo "</td>\n";
 	echo "</td>\n";
@@ -308,6 +329,17 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</td>\n";
 	echo "</td>\n";
 	echo "</tr>\n";
 	echo "</tr>\n";
 
 
+	echo "<tr>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	Description:\n";
+	echo "</td>\n";
+	echo "<td class='vtable' align='left'>\n";
+	echo "	<input class='formfld' type='text' name='phone_description' maxlength='255' value=\"$phone_description\">\n";
+	echo "<br />\n";
+	echo "Enter the description.\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
 	echo "	<tr>\n";
 	echo "	<tr>\n";
 	echo "		<td colspan='2' align='right'>\n";
 	echo "		<td colspan='2' align='right'>\n";
 	echo "				<input type='hidden' name='contact_uuid' value='$contact_uuid'>\n";
 	echo "				<input type='hidden' name='contact_uuid' value='$contact_uuid'>\n";

+ 5 - 1
contacts.php

@@ -87,6 +87,7 @@ require_once "includes/paging.php";
 				$sql .= "	contact_name_family like '%".$search_all."%' or \n";
 				$sql .= "	contact_name_family like '%".$search_all."%' or \n";
 				$sql .= "	contact_nickname like '%".$search_all."%' or \n";
 				$sql .= "	contact_nickname like '%".$search_all."%' or \n";
 				$sql .= "	contact_title like '%".$search_all."%' or \n";
 				$sql .= "	contact_title like '%".$search_all."%' or \n";
+				$sql .= "	contact_category like '%".$search_all."%' or \n";
 				$sql .= "	contact_role like '%".$search_all."%' or \n";
 				$sql .= "	contact_role like '%".$search_all."%' or \n";
 				$sql .= "	contact_email like '%".$search_all."%' or \n";
 				$sql .= "	contact_email like '%".$search_all."%' or \n";
 				$sql .= "	contact_url like '%".$search_all."%' or \n";
 				$sql .= "	contact_url like '%".$search_all."%' or \n";
@@ -111,7 +112,7 @@ require_once "includes/paging.php";
 		}
 		}
 
 
 	//prepare to page the results
 	//prepare to page the results
-		$rows_per_page = 30;
+		$rows_per_page = 150;
 		$param = "";
 		$param = "";
 		$page = $_GET['page'];
 		$page = $_GET['page'];
 		if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } 
 		if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } 
@@ -134,6 +135,7 @@ require_once "includes/paging.php";
 				$sql .= "	contact_name_family like '%".$search_all."%' or \n";
 				$sql .= "	contact_name_family like '%".$search_all."%' or \n";
 				$sql .= "	contact_nickname like '%".$search_all."%' or \n";
 				$sql .= "	contact_nickname like '%".$search_all."%' or \n";
 				$sql .= "	contact_title like '%".$search_all."%' or \n";
 				$sql .= "	contact_title like '%".$search_all."%' or \n";
+				$sql .= "	contact_category like '%".$search_all."%' or \n";
 				$sql .= "	contact_role like '%".$search_all."%' or \n";
 				$sql .= "	contact_role like '%".$search_all."%' or \n";
 				$sql .= "	contact_email like '%".$search_all."%' or \n";
 				$sql .= "	contact_email like '%".$search_all."%' or \n";
 				$sql .= "	contact_url like '%".$search_all."%' or \n";
 				$sql .= "	contact_url like '%".$search_all."%' or \n";
@@ -165,6 +167,7 @@ require_once "includes/paging.php";
 	echo th_order_by('contact_name_family', 'Last Name', $order_by, $order);
 	echo th_order_by('contact_name_family', 'Last Name', $order_by, $order);
 	echo th_order_by('contact_nickname', 'Nickname', $order_by, $order);
 	echo th_order_by('contact_nickname', 'Nickname', $order_by, $order);
 	echo th_order_by('contact_title', 'Title', $order_by, $order);
 	echo th_order_by('contact_title', 'Title', $order_by, $order);
+	//echo th_order_by('contact_category', 'Category', $order_by, $order);
 	echo th_order_by('contact_role', 'Role', $order_by, $order);
 	echo th_order_by('contact_role', 'Role', $order_by, $order);
 	//echo th_order_by('contact_email', 'Email', $order_by, $order);
 	//echo th_order_by('contact_email', 'Email', $order_by, $order);
 	//echo th_order_by('contact_url', 'URL', $order_by, $order);
 	//echo th_order_by('contact_url', 'URL', $order_by, $order);
@@ -184,6 +187,7 @@ require_once "includes/paging.php";
 			echo "	<td valign='top' class='".$row_style[$c]."'>".$row['contact_name_family']."&nbsp;</td>\n";
 			echo "	<td valign='top' class='".$row_style[$c]."'>".$row['contact_name_family']."&nbsp;</td>\n";
 			echo "	<td valign='top' class='".$row_style[$c]."'>".$row['contact_nickname']."&nbsp;</td>\n";
 			echo "	<td valign='top' class='".$row_style[$c]."'>".$row['contact_nickname']."&nbsp;</td>\n";
 			echo "	<td valign='top' class='".$row_style[$c]."'>".$row['contact_title']."&nbsp;</td>\n";
 			echo "	<td valign='top' class='".$row_style[$c]."'>".$row['contact_title']."&nbsp;</td>\n";
+			//echo "	<td valign='top' class='".$row_style[$c]."'>".$row['contact_category']."&nbsp;</td>\n";
 			echo "	<td valign='top' class='".$row_style[$c]."'>".$row['contact_role']."&nbsp;</td>\n";
 			echo "	<td valign='top' class='".$row_style[$c]."'>".$row['contact_role']."&nbsp;</td>\n";
 			//echo "	<td valign='top' class='".$row_style[$c]."'>".$row['contact_email']."&nbsp;</td>\n";
 			//echo "	<td valign='top' class='".$row_style[$c]."'>".$row['contact_email']."&nbsp;</td>\n";
 			//echo "	<td valign='top' class='".$row_style[$c]."'>".$row['contact_url']."&nbsp;</td>\n";
 			//echo "	<td valign='top' class='".$row_style[$c]."'>".$row['contact_url']."&nbsp;</td>\n";

+ 151 - 79
contacts_edit.php

@@ -51,6 +51,7 @@ else {
 		$contact_name_family = check_str($_POST["contact_name_family"]);
 		$contact_name_family = check_str($_POST["contact_name_family"]);
 		$contact_nickname = check_str($_POST["contact_nickname"]);
 		$contact_nickname = check_str($_POST["contact_nickname"]);
 		$contact_title = check_str($_POST["contact_title"]);
 		$contact_title = check_str($_POST["contact_title"]);
+		$contact_category = check_str($_POST["contact_category"]);
 		$contact_role = check_str($_POST["contact_role"]);
 		$contact_role = check_str($_POST["contact_role"]);
 		$contact_email = check_str($_POST["contact_email"]);
 		$contact_email = check_str($_POST["contact_email"]);
 		$contact_url = check_str($_POST["contact_url"]);
 		$contact_url = check_str($_POST["contact_url"]);
@@ -74,10 +75,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		//if (strlen($contact_nickname) == 0) { $msg .= "Please provide: Nickname<br>\n"; }
 		//if (strlen($contact_nickname) == 0) { $msg .= "Please provide: Nickname<br>\n"; }
 		//if (strlen($contact_title) == 0) { $msg .= "Please provide: Title<br>\n"; }
 		//if (strlen($contact_title) == 0) { $msg .= "Please provide: Title<br>\n"; }
 		//if (strlen($contact_role) == 0) { $msg .= "Please provide: Role<br>\n"; }
 		//if (strlen($contact_role) == 0) { $msg .= "Please provide: Role<br>\n"; }
-		//if (strlen($) == 0) { $msg .= "Please provide: Contact Information<br>\n"; }
 		//if (strlen($contact_email) == 0) { $msg .= "Please provide: Email<br>\n"; }
 		//if (strlen($contact_email) == 0) { $msg .= "Please provide: Email<br>\n"; }
 		//if (strlen($contact_url) == 0) { $msg .= "Please provide: URL<br>\n"; }
 		//if (strlen($contact_url) == 0) { $msg .= "Please provide: URL<br>\n"; }
-		//if (strlen($) == 0) { $msg .= "Please provide: Additional Information<br>\n"; }
 		//if (strlen($contact_time_zone) == 0) { $msg .= "Please provide: Time Zone<br>\n"; }
 		//if (strlen($contact_time_zone) == 0) { $msg .= "Please provide: Time Zone<br>\n"; }
 		//if (strlen($contact_note) == 0) { $msg .= "Please provide: Notes<br>\n"; }
 		//if (strlen($contact_note) == 0) { $msg .= "Please provide: Notes<br>\n"; }
 		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
 		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
@@ -107,6 +106,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			$sql .= "contact_name_family, ";
 			$sql .= "contact_name_family, ";
 			$sql .= "contact_nickname, ";
 			$sql .= "contact_nickname, ";
 			$sql .= "contact_title, ";
 			$sql .= "contact_title, ";
+			$sql .= "contact_category, ";
 			$sql .= "contact_role, ";
 			$sql .= "contact_role, ";
 			$sql .= "contact_email, ";
 			$sql .= "contact_email, ";
 			$sql .= "contact_url, ";
 			$sql .= "contact_url, ";
@@ -123,6 +123,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			$sql .= "'$contact_name_family', ";
 			$sql .= "'$contact_name_family', ";
 			$sql .= "'$contact_nickname', ";
 			$sql .= "'$contact_nickname', ";
 			$sql .= "'$contact_title', ";
 			$sql .= "'$contact_title', ";
+			$sql .= "'$contact_category', ";
 			$sql .= "'$contact_role', ";
 			$sql .= "'$contact_role', ";
 			$sql .= "'$contact_email', ";
 			$sql .= "'$contact_email', ";
 			$sql .= "'$contact_url', ";
 			$sql .= "'$contact_url', ";
@@ -149,6 +150,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			$sql .= "contact_name_family = '$contact_name_family', ";
 			$sql .= "contact_name_family = '$contact_name_family', ";
 			$sql .= "contact_nickname = '$contact_nickname', ";
 			$sql .= "contact_nickname = '$contact_nickname', ";
 			$sql .= "contact_title = '$contact_title', ";
 			$sql .= "contact_title = '$contact_title', ";
+			$sql .= "contact_category = '$contact_category', ";
 			$sql .= "contact_role = '$contact_role', ";
 			$sql .= "contact_role = '$contact_role', ";
 			$sql .= "contact_email = '$contact_email', ";
 			$sql .= "contact_email = '$contact_email', ";
 			$sql .= "contact_url = '$contact_url', ";
 			$sql .= "contact_url = '$contact_url', ";
@@ -173,8 +175,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 //pre-populate the form
 //pre-populate the form
 	if (count($_GET)>0 && $_POST["persistformvar"] != "true") {
 	if (count($_GET)>0 && $_POST["persistformvar"] != "true") {
 		$contact_uuid = $_GET["id"];
 		$contact_uuid = $_GET["id"];
-		$sql = "";
-		$sql .= "select * from v_contacts ";
+		$sql = "select * from v_contacts ";
 		$sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' ";
 		$sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' ";
 		$sql .= "and contact_uuid = '$contact_uuid' ";
 		$sql .= "and contact_uuid = '$contact_uuid' ";
 		$prep_statement = $db->prepare(check_sql($sql));
 		$prep_statement = $db->prepare(check_sql($sql));
@@ -187,6 +188,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			$contact_name_family = $row["contact_name_family"];
 			$contact_name_family = $row["contact_name_family"];
 			$contact_nickname = $row["contact_nickname"];
 			$contact_nickname = $row["contact_nickname"];
 			$contact_title = $row["contact_title"];
 			$contact_title = $row["contact_title"];
+			$contact_category = $row["contact_category"];
 			$contact_role = $row["contact_role"];
 			$contact_role = $row["contact_role"];
 			$contact_email = $row["contact_email"];
 			$contact_email = $row["contact_email"];
 			$contact_url = $row["contact_url"];
 			$contact_url = $row["contact_url"];
@@ -210,12 +212,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "<div align='center'>\n";
 	echo "<div align='center'>\n";
 	echo "<table width='100%' border='0' cellpadding='6' cellspacing='0'>\n";
 	echo "<table width='100%' border='0' cellpadding='6' cellspacing='0'>\n";
 	echo "<tr>\n";
 	echo "<tr>\n";
-	if ($action == "add") {
-		echo "<td align='left' width='30%' nowrap='nowrap'><b>Contact Add</b></td>\n";
-	}
-	if ($action == "update") {
-		echo "<td align='left' width='30%' nowrap='nowrap'><b>Contact Edit</b></td>\n";
-	}
+	echo "<td align='left' width='30%' nowrap='nowrap'><b>Contact</b></td>\n";
 	echo "<td width='70%' align='right'>\n";
 	echo "<td width='70%' align='right'>\n";
 	echo "	<input type='button' class='btn' name='' alt='qr code' onclick=\"window.location='contacts_vcard.php?id=$contact_uuid&type=image'\" value='QR Code'>\n";
 	echo "	<input type='button' class='btn' name='' alt='qr code' onclick=\"window.location='contacts_vcard.php?id=$contact_uuid&type=image'\" value='QR Code'>\n";
 	echo "	<input type='button' class='btn' name='' alt='vcard' onclick=\"window.location='contacts_vcard.php?id=$contact_uuid&type=download'\" value='vCard'>\n";
 	echo "	<input type='button' class='btn' name='' alt='vcard' onclick=\"window.location='contacts_vcard.php?id=$contact_uuid&type=download'\" value='vCard'>\n";
@@ -248,75 +245,92 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		echo "	Type:\n";
 		echo "	Type:\n";
 		echo "</td>\n";
 		echo "</td>\n";
 		echo "<td class='vtable' align='left'>\n";
 		echo "<td class='vtable' align='left'>\n";
-		echo "	<select class='formfld' style='width:85%;' name='contact_type'>\n";
-		echo "	<option value=''></option>\n";
-		if ($contact_type == "customer") { 
-			echo "	<option value='customer' selected='selected' >Customer</option>\n";
-		}
-		else {
-			echo "	<option value='customer'>Customer</option>\n";
-		}
-		if ($contact_type == "contractor") { 
-			echo "	<option value='contractor' selected='selected' >Contractor</option>\n";
-		}
-		else {
-			echo "	<option value='contractor'>Contractor</option>\n";
-		}
-		if ($contact_type == "friend") { 
-			echo "	<option value='friend' selected='selected' >Friend</option>\n";
-		}
-		else {
-			echo "	<option value='friend'>Friend</option>\n";
-		}
-		if ($contact_type == "lead") { 
-			echo "	<option value='lead' selected='selected' >Lead</option>\n";
-		}
-		else {
-			echo "	<option value='lead'>Lead</option>\n";
-		}
-		if ($contact_type == "member") { 
-			echo "	<option value='member' selected='selected' >Member</option>\n";
-		}
-		else {
-			echo "	<option value='member'>Member</option>\n";
-		}
-		if ($contact_type == "family") { 
-			echo "	<option value='family' selected='selected' >Family</option>\n";
-		}
-		else {
-			echo "	<option value='family'>Family</option>\n";
-		}
-		if ($contact_type == "subscriber") { 
-			echo "	<option value='subscriber' selected='selected' >Subscriber</option>\n";
-		}
-		else {
-			echo "	<option value='subscriber'>Subscriber</option>\n";
-		}
-		if ($contact_type == "supplier") { 
-			echo "	<option value='supplier' selected='selected' >Supplier</option>\n";
-		}
-		else {
-			echo "	<option value='supplier'>Supplier</option>\n";
-		}
-		if ($contact_type == "provider") { 
-			echo "	<option value='provider' selected='selected' >Provider</option>\n";
-		}
-		else {
-			echo "	<option value='provider'>Provider</option>\n";
-		}
-		if ($contact_type == "user") { 
-			echo "	<option value='user' selected='selected' >User</option>\n";
-		}
-		else {
-			echo "	<option value='user'>User</option>\n";
-		}
-		if ($contact_type == "volunteer") { 
-			echo "	<option value='volunteer' selected='selected' >Volunteer</option>\n";
+		
+		if (is_array($_SESSION["contact"]["role"])) {
+			sort($_SESSION["contact"]["role"]);
+			echo "	<select class='formfld' style='width:85%;' name='contact_type'>\n";
+			echo "	<option value=''></option>\n";
+			foreach($_SESSION["contact"]["type"] as $row) {
+				if ($row == $contact_type) { 
+					echo "	<option value='".$row."' selected='selected'>".$row."</option>\n";
+				}
+				else {
+					echo "	<option value='".$row."'>".$row."</option>\n";
+				}
+			}
+			echo "	</select>\n";
 		}
 		}
 		else {
 		else {
-			echo "	<option value='volunteer'>Volunteer</option>\n";
+			echo "	<select class='formfld' style='width:85%;' name='contact_type'>\n";
+			echo "	<option value=''></option>\n";
+			if ($contact_type == "customer") { 
+				echo "	<option value='customer' selected='selected' >Customer</option>\n";
+			}
+			else {
+				echo "	<option value='customer'>Customer</option>\n";
+			}
+			if ($contact_type == "contractor") { 
+				echo "	<option value='contractor' selected='selected' >Contractor</option>\n";
+			}
+			else {
+				echo "	<option value='contractor'>Contractor</option>\n";
+			}
+			if ($contact_type == "friend") { 
+				echo "	<option value='friend' selected='selected' >Friend</option>\n";
+			}
+			else {
+				echo "	<option value='friend'>Friend</option>\n";
+			}
+			if ($contact_type == "lead") { 
+				echo "	<option value='lead' selected='selected' >Lead</option>\n";
+			}
+			else {
+				echo "	<option value='lead'>Lead</option>\n";
+			}
+			if ($contact_type == "member") { 
+				echo "	<option value='member' selected='selected' >Member</option>\n";
+			}
+			else {
+				echo "	<option value='member'>Member</option>\n";
+			}
+			if ($contact_type == "family") { 
+				echo "	<option value='family' selected='selected' >Family</option>\n";
+			}
+			else {
+				echo "	<option value='family'>Family</option>\n";
+			}
+			if ($contact_type == "subscriber") { 
+				echo "	<option value='subscriber' selected='selected' >Subscriber</option>\n";
+			}
+			else {
+				echo "	<option value='subscriber'>Subscriber</option>\n";
+			}
+			if ($contact_type == "supplier") { 
+				echo "	<option value='supplier' selected='selected' >Supplier</option>\n";
+			}
+			else {
+				echo "	<option value='supplier'>Supplier</option>\n";
+			}
+			if ($contact_type == "provider") { 
+				echo "	<option value='provider' selected='selected' >Provider</option>\n";
+			}
+			else {
+				echo "	<option value='provider'>Provider</option>\n";
+			}
+			if ($contact_type == "user") { 
+				echo "	<option value='user' selected='selected' >User</option>\n";
+			}
+			else {
+				echo "	<option value='user'>User</option>\n";
+			}
+			if ($contact_type == "volunteer") { 
+				echo "	<option value='volunteer' selected='selected' >Volunteer</option>\n";
+			}
+			else {
+				echo "	<option value='volunteer'>Volunteer</option>\n";
+			}
+			echo "	</select>\n";
 		}
 		}
-		echo "	</select>\n";
 		echo "<br />\n";
 		echo "<br />\n";
 		echo "Select the contact type.\n";
 		echo "Select the contact type.\n";
 		echo "</td>\n";
 		echo "</td>\n";
@@ -371,18 +385,77 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		echo "	Title:\n";
 		echo "	Title:\n";
 		echo "</td>\n";
 		echo "</td>\n";
 		echo "<td class='vtable' align='left'>\n";
 		echo "<td class='vtable' align='left'>\n";
-		echo "	<input class='formfld' style='width:85%;' type='text' name='contact_title' maxlength='255' value=\"$contact_title\">\n";
+		if (is_array($_SESSION["contact"]["title"])) {
+			sort($_SESSION["contact"]["title"]);
+			echo "	<select class='formfld' style='width:85%;' name='contact_title'>\n";
+			echo "	<option value=''></option>\n";
+			foreach($_SESSION["contact"]["title"] as $row) {
+				if ($row == $contact_title) { 
+					echo "	<option value='".$row."' selected='selected'>".$row."</option>\n";
+				}
+				else {
+					echo "	<option value='".$row."'>".$row."</option>\n";
+				}
+			}
+			echo "	</select>\n";
+		}
+		else {
+			echo "	<input class='formfld' style='width:85%;' type='text' name='contact_title' maxlength='255' value=\"$contact_title\">\n";
+		}
 		echo "<br />\n";
 		echo "<br />\n";
 		echo "Enter the title.\n";
 		echo "Enter the title.\n";
 		echo "</td>\n";
 		echo "</td>\n";
 		echo "</tr>\n";
 		echo "</tr>\n";
 
 
+		echo "<tr>\n";
+		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+		echo "	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' style='width:85%;' name='contact_category'>\n";
+			echo "	<option value=''></option>\n";
+			foreach($_SESSION["contact"]["category"] as $row) {
+				if ($row == $contact_category) { 
+					echo "	<option value='".$row."' selected='selected'>".$row."</option>\n";
+				}
+				else {
+					echo "	<option value='".$row."'>".$row."</option>\n";
+				}
+			}
+			echo "	</select>\n";
+		}
+		else {
+			echo "	<input class='formfld' style='width:85%;' type='text' name='contact_category' maxlength='255' value=\"$contact_category\">\n";
+		}
+		echo "<br />\n";
+		echo "Enter the category.\n";
+		echo "</td>\n";
+		echo "</tr>\n";
+
 		echo "<tr>\n";
 		echo "<tr>\n";
 		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
 		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
 		echo "	Role:\n";
 		echo "	Role:\n";
 		echo "</td>\n";
 		echo "</td>\n";
 		echo "<td class='vtable' align='left'>\n";
 		echo "<td class='vtable' align='left'>\n";
-		echo "	<input class='formfld' style='width:85%;' type='text' name='contact_role' maxlength='255' value=\"$contact_role\">\n";
+		if (is_array($_SESSION["contact"]["role"])) {
+			sort($_SESSION["contact"]["role"]);
+			echo "	<select class='formfld' style='width:85%;' name='contact_role'>\n";
+			echo "	<option value=''></option>\n";
+			foreach($_SESSION["contact"]["role"] as $row) {
+				if ($row == $contact_role) { 
+					echo "	<option value='".$row."' selected='selected'>".$row."</option>\n";
+				}
+				else {
+					echo "	<option value='".$row."'>".$row."</option>\n";
+				}
+			}
+			echo "	</select>\n";
+		}
+		else {
+			echo "	<input class='formfld' style='width:85%;' type='text' name='contact_role' maxlength='255' value=\"$contact_role\">\n";
+		}
 		echo "<br />\n";
 		echo "<br />\n";
 		echo "Enter the role.\n";
 		echo "Enter the role.\n";
 		echo "</td>\n";
 		echo "</td>\n";
@@ -459,7 +532,6 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			require "contact_phones.php";
 			require "contact_phones.php";
 			require "contact_addresses.php";
 			require "contact_addresses.php";
 			require "contact_notes.php";
 			require "contact_notes.php";
-			//echo "<br/><br/>\n";
 		}
 		}
 
 
 	echo "</td>\n";
 	echo "</td>\n";