From f959c3717c3e941527e541ac70ae277b5079ab19 Mon Sep 17 00:00:00 2001
From: FusionPBX <mark@fusionpbx.com>
Date: Sat, 20 Jul 2024 20:23:17 -0600
Subject: [PATCH] Update contacts.php

- Add trim
- Adjust indentation
---
 app/contacts/contacts.php | 72 +++++++++++++++++++++------------------
 1 file changed, 38 insertions(+), 34 deletions(-)

diff --git a/app/contacts/contacts.php b/app/contacts/contacts.php
index 632dc09078..7cda88acee 100644
--- a/app/contacts/contacts.php
+++ b/app/contacts/contacts.php
@@ -130,7 +130,7 @@
 	$order = $_GET["order"] ?? '';
 
 //add the search term
-	$search = strtolower($_GET["search"] ?? '');
+	$search = strtolower(trim($_GET["search"]) ?? '');
 	if (!empty($search)) {
 		if (is_numeric($search)) {
 			$sql_search = "and contact_uuid in ( ";
@@ -143,46 +143,50 @@
 		}
 		else {
 			//open container
-				$sql_search = "and ( ";
+			$sql_search = "and ( ";
+
 			//search contact
-				$sql_search .= "contact_uuid in ( ";
-				$sql_search .= "	select contact_uuid from v_contacts ";
+			$sql_search .= "contact_uuid in ( ";
+			$sql_search .= "	select contact_uuid from v_contacts ";
+			$sql_search .= "	where domain_uuid = :domain_uuid ";
+			$sql_search .= "	and ( ";
+			$sql_search .= "		lower(contact_organization) like :search or ";
+			$sql_search .= "		lower(contact_name_given) like :search or ";
+			$sql_search .= "		lower(contact_name_family) like :search or ";
+			$sql_search .= "		lower(contact_nickname) like :search or ";
+			$sql_search .= "		lower(contact_title) like :search or ";
+			$sql_search .= "		lower(contact_category) like :search or ";
+			$sql_search .= "		lower(contact_role) like :search or ";
+			$sql_search .= "		lower(contact_url) like :search or ";
+			$sql_search .= "		lower(contact_time_zone) like :search or ";
+			$sql_search .= "		lower(contact_note) like :search or ";
+			$sql_search .= "		lower(contact_type) like :search ";
+			$sql_search .= "	) ";
+			$sql_search .= ") ";
+
+			//search contact emails
+			if (permission_exists('contact_email_view')) {
+				$sql_search .= "or contact_uuid in ( ";
+				$sql_search .= "	select contact_uuid from v_contact_emails ";
 				$sql_search .= "	where domain_uuid = :domain_uuid ";
 				$sql_search .= "	and ( ";
-				$sql_search .= "		lower(contact_organization) like :search or ";
-				$sql_search .= "		lower(contact_name_given) like :search or ";
-				$sql_search .= "		lower(contact_name_family) like :search or ";
-				$sql_search .= "		lower(contact_nickname) like :search or ";
-				$sql_search .= "		lower(contact_title) like :search or ";
-				$sql_search .= "		lower(contact_category) like :search or ";
-				$sql_search .= "		lower(contact_role) like :search or ";
-				$sql_search .= "		lower(contact_url) like :search or ";
-				$sql_search .= "		lower(contact_time_zone) like :search or ";
-				$sql_search .= "		lower(contact_note) like :search or ";
-				$sql_search .= "		lower(contact_type) like :search ";
+				$sql_search .= "		lower(email_address) like :search or ";
+				$sql_search .= "		lower(email_description) like :search ";
 				$sql_search .= "	) ";
 				$sql_search .= ") ";
-			//search contact emails
-				if (permission_exists('contact_email_view')) {
-					$sql_search .= "or contact_uuid in ( ";
-					$sql_search .= "	select contact_uuid from v_contact_emails ";
-					$sql_search .= "	where domain_uuid = :domain_uuid ";
-					$sql_search .= "	and ( ";
-					$sql_search .= "		lower(email_address) like :search or ";
-					$sql_search .= "		lower(email_description) like :search ";
-					$sql_search .= "	) ";
-					$sql_search .= ") ";
-				}
+			}
+
 			//search contact notes
-				if (permission_exists('contact_note_view')) {
-					$sql_search .= "or contact_uuid in ( ";
-					$sql_search .= "	select contact_uuid from v_contact_notes ";
-					$sql_search .= "	where domain_uuid = :domain_uuid ";
-					$sql_search .= "	and lower(contact_note) like :search ";
-					$sql_search .= ") ";
-				}
-			//close container
+			if (permission_exists('contact_note_view')) {
+				$sql_search .= "or contact_uuid in ( ";
+				$sql_search .= "	select contact_uuid from v_contact_notes ";
+				$sql_search .= "	where domain_uuid = :domain_uuid ";
+				$sql_search .= "	and lower(contact_note) like :search ";
 				$sql_search .= ") ";
+			}
+
+			//close container
+			$sql_search .= ") ";
 		}
 		$parameters['search'] = '%'.$search.'%';
 	}