From 152955625ce2c34b628a1aea087dab5bf0e80931 Mon Sep 17 00:00:00 2001
From: Andrew Querol <aquerol@percipia.com>
Date: Mon, 22 Mar 2021 23:13:33 -0500
Subject: [PATCH 1/6] Initial attempt at allowing the destination button button
  to dynamically change

This sets the UUID as the ID in the options list. The we use the javascript onclick listener to get the id(uuid) of the selected option and open the link to the edit page.
---
 .../resources/classes/destinations.php        | 29 +++++++++----------
 app/destinations/resources/destinations.php   |  5 ++--
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/app/destinations/resources/classes/destinations.php b/app/destinations/resources/classes/destinations.php
index 6f81f54f33..d95d234d2e 100644
--- a/app/destinations/resources/classes/destinations.php
+++ b/app/destinations/resources/classes/destinations.php
@@ -476,10 +476,11 @@ if (!class_exists('destinations')) {
 				$language2 = new text;
 
 				//build the destination select list in html
-				$response .= "	<select class='formfld' style='".$select_style."' onchange=\"get_destinations('".$destination_id."', '".$destination_type."', this.value);\">\n";
+				$response .= "	<select id='{destination_id}_type' class='formfld' style='".$select_style."' onchange=\"get_destinations('".$destination_id."', '".$destination_type."', this.value);\">\n";
 				$response .= " 		<option value=''></option>\n";
 				foreach($_SESSION['destinations']['array'][$destination_type] as $key => $value) {
-					if (permission_exists($destination->singular($key)."_destinations")) {
+					$singular = $this->singular($key);
+					if (permission_exists("{$singular}_destinations")) {
 						//determine if selected
 						$selected = ($key == $destination_key) ? "selected='selected'" : ''; 
 
@@ -493,7 +494,7 @@ if (!class_exists('destinations')) {
 							$text2 = $language2->get($_SESSION['domain']['language']['code'], 'app/dialplans');
 						}
 						//add the application to the select list
-						$response .= "		<option value='".$key."' $selected>".$text2['title-'.$key]."</option>\n";
+						$response .= "		<option id='{$singular}' class='{$key}' value='".$key."' $selected>".$text2['title-'.$key]."</option>\n";
 					}
 				}
 				$response .= "	</select>\n";
@@ -502,22 +503,18 @@ if (!class_exists('destinations')) {
 					if ($key == $destination_key) {
 						foreach($value as $k => $row) {
 							$selected = ($row['destination'] == $destination_value) ? "selected='selected'" : ''; 
-							$response .= "		<option value='".$row['destination']."' $selected>".$row['label']."</option>\n";
-							if ($row['destination'] == $destination_value) {
-								$response_button = button::create([
-									'type'=>'button',
-									'icon'=>'external-link-alt',
-									'id'=>'btn_dest_go',
-									'title'=>$row['label'],
-									//'style'=>'margin-left: 15px;',
-									'link'=>'/app/'.$key.'/'.$this->singular($key).'_edit.php?id='.$row[$this->singular($key).'_uuid']
-								])."\n";
-							}
+							$response .= "		<option id='{$row[$this->singular($key).'_uuid']}' value='".$row['destination']."' $selected>".$row['label']."</option>\n";
 						}
 					}
 				}
-				$response .= "	</select>".$response_button."\n";
-				
+				$response .= "	</select>";
+				$response .= button::create([
+					'type'=>'button',
+					'icon'=>'external-link-alt',
+					'id'=>'btn_dest_go',
+					'title'=>$text['label-edit'],
+					'onclick'=>"let types = document.getElementById('{destination_id}_type').options; let opts = document.getElementById('{$destination_id}').options; window.location.assign('/app/'+types[types.selectedIndex].className+'/'+types[types.selectedIndex].id+'_edit.php?id='+opts[opts.selectedIndex].id);"
+				])."\n";
 
 				//debug information
 				//echo $response;
diff --git a/app/destinations/resources/destinations.php b/app/destinations/resources/destinations.php
index e8095231bf..29595bf316 100644
--- a/app/destinations/resources/destinations.php
+++ b/app/destinations/resources/destinations.php
@@ -30,7 +30,8 @@
 	echo "	<select name='subaction' id='action' class='formfld' style='".$select_style."'>\n";
 	echo "	<option value=''></option>\n";
 	foreach($destinations as $key => $rows) {
-		if ($key == $action && permission_exists($destination->singular($key)."_destinations")) {
+		$singular = $destination->singular($key);
+		if ($key == $action && permission_exists("{$singular}_destinations")) {
 			if (is_array($rows)) {
 				foreach($rows as $row) {
 
@@ -50,7 +51,7 @@
 					$select_label = str_replace('email-icon', '&#9993', $select_label);
 
 					//add the select option
-					echo "		<option value='".$select_value."'>".$select_label."</option>\n";
+					echo "		<option id='{$row[$singular.'_uuid']}' value='".$select_value."'>".$select_label."</option>\n";
 				}
 			}
 		}

From f1fbbad7ab864873e00999da5fa3e92bd4621173 Mon Sep 17 00:00:00 2001
From: Andrew Querol <aquerol@percipia.com>
Date: Mon, 22 Mar 2021 23:24:15 -0500
Subject: [PATCH 2/6] Recordings are stored in 'uuid' not 'recording_uuid'

---
 app/destinations/resources/classes/destinations.php | 5 +++--
 app/destinations/resources/destinations.php         | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/destinations/resources/classes/destinations.php b/app/destinations/resources/classes/destinations.php
index d95d234d2e..399c6c44dd 100644
--- a/app/destinations/resources/classes/destinations.php
+++ b/app/destinations/resources/classes/destinations.php
@@ -502,8 +502,9 @@ if (!class_exists('destinations')) {
 				foreach($_SESSION['destinations']['array'][$destination_type] as $key => $value) {
 					if ($key == $destination_key) {
 						foreach($value as $k => $row) {
-							$selected = ($row['destination'] == $destination_value) ? "selected='selected'" : ''; 
-							$response .= "		<option id='{$row[$this->singular($key).'_uuid']}' value='".$row['destination']."' $selected>".$row['label']."</option>\n";
+							$selected = ($row['destination'] == $destination_value) ? "selected='selected'" : '';
+							$uuid = $row[$this->singular($key).'_uuid'] ?? $row['uuid'];
+							$response .= "		<option id='{$uuid}' value='".$row['destination']."' $selected>".$row['label']."</option>\n";
 						}
 					}
 				}
diff --git a/app/destinations/resources/destinations.php b/app/destinations/resources/destinations.php
index 29595bf316..bd046637d1 100644
--- a/app/destinations/resources/destinations.php
+++ b/app/destinations/resources/destinations.php
@@ -51,7 +51,8 @@
 					$select_label = str_replace('email-icon', '&#9993', $select_label);
 
 					//add the select option
-					echo "		<option id='{$row[$singular.'_uuid']}' value='".$select_value."'>".$select_label."</option>\n";
+					$uuid = $row[$singular.'_uuid'] ?? $row['uuid'];
+					echo "		<option id='{$uuid}' value='".$select_value."'>".$select_label."</option>\n";
 				}
 			}
 		}

From 14a8c108499de2e27b38b2ec578b906e4864e75e Mon Sep 17 00:00:00 2001
From: Andrew Querol <aquerol@percipia.com>
Date: Mon, 22 Mar 2021 23:34:51 -0500
Subject: [PATCH 3/6] Fix voicemails to support the new UUID linking

---
 app/voicemails/app_config.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/voicemails/app_config.php b/app/voicemails/app_config.php
index 75e7526146..595ff12c8a 100644
--- a/app/voicemails/app_config.php
+++ b/app/voicemails/app_config.php
@@ -34,9 +34,10 @@
 		$apps[$x]['destinations'][$y]['type'] = "sql";
 		$apps[$x]['destinations'][$y]['label'] = "voicemails";
 		$apps[$x]['destinations'][$y]['name'] = "voicemails";
-		$apps[$x]['destinations'][$y]['sql'] = "select voicemail_id as destination, '*99' || voicemail_id as extension, voicemail_description as description from v_voicemails";
+		$apps[$x]['destinations'][$y]['sql'] = "select voicemail_uuid, voicemail_id as destination, '*99' || voicemail_id as extension, voicemail_description as description from v_voicemails";
 		$apps[$x]['destinations'][$y]['where'] = "where domain_uuid = '\${domain_uuid}' and voicemail_enabled = 'true' ";
 		$apps[$x]['destinations'][$y]['order_by'] = "voicemail_id asc ";
+		$apps[$x]['destinations'][$y]['field']['voicemail_uuid'] = "voicemail_uuid";
 		$apps[$x]['destinations'][$y]['field']['destination'] = "voicemail_id";
 		$apps[$x]['destinations'][$y]['field']['extension'] = "voicemail_id";
 		$apps[$x]['destinations'][$y]['field']['description'] = "voicemail_description";

From 59dbcd02a7faf88dc5adb81d8e4fc34280c7c878 Mon Sep 17 00:00:00 2001
From: Andrew Querol <aquerol@percipia.com>
Date: Mon, 22 Mar 2021 23:37:11 -0500
Subject: [PATCH 4/6] Check if there is an ID before redirecting

---
 app/destinations/resources/classes/destinations.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/destinations/resources/classes/destinations.php b/app/destinations/resources/classes/destinations.php
index 399c6c44dd..2550c276de 100644
--- a/app/destinations/resources/classes/destinations.php
+++ b/app/destinations/resources/classes/destinations.php
@@ -514,7 +514,7 @@ if (!class_exists('destinations')) {
 					'icon'=>'external-link-alt',
 					'id'=>'btn_dest_go',
 					'title'=>$text['label-edit'],
-					'onclick'=>"let types = document.getElementById('{destination_id}_type').options; let opts = document.getElementById('{$destination_id}').options; window.location.assign('/app/'+types[types.selectedIndex].className+'/'+types[types.selectedIndex].id+'_edit.php?id='+opts[opts.selectedIndex].id);"
+					'onclick'=>"let types = document.getElementById('{destination_id}_type').options; let opts = document.getElementById('{$destination_id}').options; if(opts[opts.selectedIndex].id && opts[opts.selectedIndex].id.length > 0) {window.location.assign('/app/'+types[types.selectedIndex].className+'/'+types[types.selectedIndex].id+'_edit.php?id='+opts[opts.selectedIndex].id);}"
 				])."\n";
 
 				//debug information

From ee30b5990954d1749af268d93b238562224df645 Mon Sep 17 00:00:00 2001
From: Andrew Querol <aquerol@percipia.com>
Date: Mon, 22 Mar 2021 23:44:33 -0500
Subject: [PATCH 5/6] Switch to window.open to '_blank' to prevent accidental
 navigation that looses changes.

---
 app/destinations/resources/classes/destinations.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/destinations/resources/classes/destinations.php b/app/destinations/resources/classes/destinations.php
index 2550c276de..435bd29057 100644
--- a/app/destinations/resources/classes/destinations.php
+++ b/app/destinations/resources/classes/destinations.php
@@ -514,7 +514,7 @@ if (!class_exists('destinations')) {
 					'icon'=>'external-link-alt',
 					'id'=>'btn_dest_go',
 					'title'=>$text['label-edit'],
-					'onclick'=>"let types = document.getElementById('{destination_id}_type').options; let opts = document.getElementById('{$destination_id}').options; if(opts[opts.selectedIndex].id && opts[opts.selectedIndex].id.length > 0) {window.location.assign('/app/'+types[types.selectedIndex].className+'/'+types[types.selectedIndex].id+'_edit.php?id='+opts[opts.selectedIndex].id);}"
+					'onclick'=>"let types = document.getElementById('{destination_id}_type').options; let opts = document.getElementById('{$destination_id}').options; if(opts[opts.selectedIndex].id && opts[opts.selectedIndex].id.length > 0) {window.open('/app/'+types[types.selectedIndex].className+'/'+types[types.selectedIndex].id+'_edit.php?id='+opts[opts.selectedIndex].id, '_blank');}"
 				])."\n";
 
 				//debug information

From 4075a12a74d641945732c8c8d86047a8136703a7 Mon Sep 17 00:00:00 2001
From: Andrew Querol <aquerol@percipia.com>
Date: Tue, 23 Mar 2021 00:06:42 -0500
Subject: [PATCH 6/6] Do not use the null coalescing operator to retain pre PHP
 7 support.

---
 app/destinations/resources/classes/destinations.php | 2 +-
 app/destinations/resources/destinations.php         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/destinations/resources/classes/destinations.php b/app/destinations/resources/classes/destinations.php
index 435bd29057..efcc87f364 100644
--- a/app/destinations/resources/classes/destinations.php
+++ b/app/destinations/resources/classes/destinations.php
@@ -503,7 +503,7 @@ if (!class_exists('destinations')) {
 					if ($key == $destination_key) {
 						foreach($value as $k => $row) {
 							$selected = ($row['destination'] == $destination_value) ? "selected='selected'" : '';
-							$uuid = $row[$this->singular($key).'_uuid'] ?? $row['uuid'];
+							$uuid = isset($row[$this->singular($key).'_uuid']) ? $row[$this->singular($key).'_uuid'] : $row['uuid'];
 							$response .= "		<option id='{$uuid}' value='".$row['destination']."' $selected>".$row['label']."</option>\n";
 						}
 					}
diff --git a/app/destinations/resources/destinations.php b/app/destinations/resources/destinations.php
index bd046637d1..ae026b5e6e 100644
--- a/app/destinations/resources/destinations.php
+++ b/app/destinations/resources/destinations.php
@@ -51,7 +51,7 @@
 					$select_label = str_replace('email-icon', '&#9993', $select_label);
 
 					//add the select option
-					$uuid = $row[$singular.'_uuid'] ?? $row['uuid'];
+					$uuid = isset($row[$singular.'_uuid']) ? $row[$singular.'_uuid'] : $row['uuid'];
 					echo "		<option id='{$uuid}' value='".$select_value."'>".$select_label."</option>\n";
 				}
 			}