From 86bba631c1cdaf01869f48eec1d07c7fa35e5582 Mon Sep 17 00:00:00 2001
From: Nate <github@najo.com>
Date: Wed, 15 Apr 2020 13:11:29 -0600
Subject: [PATCH 01/30] Extensions - Edit: Hide User select if empty.

---
 app/extensions/extension_edit.php | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/app/extensions/extension_edit.php b/app/extensions/extension_edit.php
index 0ce914f317..3454c094ea 100644
--- a/app/extensions/extension_edit.php
+++ b/app/extensions/extension_edit.php
@@ -969,17 +969,18 @@
 			echo "		</table>\n";
 			echo "		<br />\n";
 		}
-
-		echo "			<select name='extension_users[0][user_uuid]' id='user_uuid' class='formfld' style='width: auto;'>\n";
-		echo "			<option value=''></option>\n";
-		foreach($users as $field) {
-			echo "			<option value='".escape($field['user_uuid'])."'>".escape($field['username'])."</option>\n";
+		if (is_array($users) && @sizeof($users) != 0) {
+			echo "			<select name='extension_users[0][user_uuid]' id='user_uuid' class='formfld' style='width: auto;'>\n";
+			echo "			<option value=''></option>\n";
+			foreach($users as $field) {
+				echo "			<option value='".escape($field['user_uuid'])."'>".escape($field['username'])."</option>\n";
+			}
+			echo "			</select>";
+			if ($action == "update") {
+				echo button::create(['type'=>'submit','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add']]);
+			}
+			echo "			<br>\n";
 		}
-		echo "			</select>";
-		if ($action == "update") {
-			echo button::create(['type'=>'submit','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add']]);
-		}
-		echo "			<br>\n";
 		echo "			".$text['description-user_list']."\n";
 		echo "			<br />\n";
 		echo "		</td>";

From c4f410aff0b58fd5e8b1f4f789a2d4a36080c4da Mon Sep 17 00:00:00 2001
From: Nate <github@najo.com>
Date: Wed, 15 Apr 2020 15:07:52 -0600
Subject: [PATCH 02/30] Call Flows - List: Fix Status toggle.

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

diff --git a/app/call_flows/call_flows.php b/app/call_flows/call_flows.php
index 55ec083021..c04299a2c1 100644
--- a/app/call_flows/call_flows.php
+++ b/app/call_flows/call_flows.php
@@ -245,7 +245,7 @@
 			}
 			if (permission_exists('call_flow_edit')) {
 				echo "	<td class='no-link center'>";
-				echo button::create(['type'=>'submit','class'=>'link','label'=>$text['label-'.($row['call_flow_enabled'] == "true" ? 'true' : 'false')],'title'=>$text['button-toggle'],'onclick'=>"list_self_check('checkbox_".$x."'); list_action_set('toggle'); document.getElementById('toggle_field').value = 'call_flow_enabled';list_form_submit('form_list')"]);
+				echo button::create(['type'=>'submit','class'=>'link','label'=>$text['label-'.($row['call_flow_enabled'] == "true" ? 'true' : 'false')],'title'=>$text['button-toggle'],'onclick'=>"list_self_check('checkbox_".$x."'); list_action_set('toggle'); document.getElementById('toggle_field').value = 'call_flow_enabled'; list_form_submit('form_list')"]);
 			}
 			else {
 				echo "	<td class='center'>";
diff --git a/app/call_flows/resources/classes/call_flows.php b/app/call_flows/resources/classes/call_flows.php
index 10320a3e07..ee92278e09 100644
--- a/app/call_flows/resources/classes/call_flows.php
+++ b/app/call_flows/resources/classes/call_flows.php
@@ -217,8 +217,10 @@ if (!class_exists('call_flows')) {
 							foreach($call_flows as $uuid => $call_flow) {
 								$array[$this->table][$x][$this->uuid_prefix.'uuid'] = $uuid;
 								$array[$this->table][$x][$this->toggle_field] = $call_flow['state'] == $this->toggle_values[0] ? $this->toggle_values[1] : $this->toggle_values[0];
-								$array['dialplans'][$x]['dialplan_uuid'] = $call_flow['dialplan_uuid'];
-								$array['dialplans'][$x]['dialplan_enabled'] = $call_flow['state'] == $this->toggle_values[0] ? $this->toggle_values[1] : $this->toggle_values[0];
+								if ($this->toggle_field == 'call_flow_enabled') {
+									$array['dialplans'][$x]['dialplan_uuid'] = $call_flow['dialplan_uuid'];
+									$array['dialplans'][$x]['dialplan_enabled'] = $call_flow['state'] == $this->toggle_values[0] ? $this->toggle_values[1] : $this->toggle_values[0];
+								}
 								$x++;
 							}
 

From c4c5a2e84cbd8fac80b80ff5ee8cd372c1387469 Mon Sep 17 00:00:00 2001
From: Nate <github@najo.com>
Date: Wed, 15 Apr 2020 17:33:22 -0600
Subject: [PATCH 03/30] Devices - Edit: Better implementation of available
 permissions.

---
 app/devices/device_edit.php | 265 ++++++++++++++++++++++--------------
 1 file changed, 161 insertions(+), 104 deletions(-)

diff --git a/app/devices/device_edit.php b/app/devices/device_edit.php
index 6a7a05ac9e..d0a90e7e0b 100644
--- a/app/devices/device_edit.php
+++ b/app/devices/device_edit.php
@@ -104,8 +104,6 @@
 				}
 				unset($sql, $parameters, $row);
 			}
-		//get assigned user
-			$device_user_uuid = $_POST["device_user_uuid"];
 		//devices
 			$domain_uuid = $_POST["domain_uuid"];
 			$device_uuid = $_POST["device_uuid"];
@@ -242,99 +240,146 @@
 				//prepare the array
 					$array['devices'][0]['domain_uuid'] = $domain_uuid;
 					$array['devices'][0]['device_uuid'] = $device_uuid;
-					$array['devices'][0]['device_mac_address'] = $device_mac_address;
+					if (permission_exists('device_mac_address')) {
+						$array['devices'][0]['device_mac_address'] = $device_mac_address;
+					}
 					//$array['devices'][0]['device_provisioned_ip'] = $device_provisioned_ip;
-					$array['devices'][0]['domain_uuid'] = $domain_uuid;
-					$array['devices'][0]['device_label'] = $device_label;
-					$array['devices'][0]['device_user_uuid'] = $device_user_uuid;
-					$array['devices'][0]['device_username'] = $device_username;
-					$array['devices'][0]['device_password'] = $device_password;
-					$array['devices'][0]['device_vendor'] = $device_vendor;
-					$array['devices'][0]['device_uuid_alternate'] = $device_uuid_alternate;
-					$array['devices'][0]['device_model'] = $device_model;
-					$array['devices'][0]['device_firmware_version'] = $device_firmware_version;
-					$array['devices'][0]['device_enabled'] = $device_enabled;
-					$array['devices'][0]['device_enabled_date'] = 'now()';
-					$array['devices'][0]['device_template'] = $device_template;
-					$array['devices'][0]['device_profile_uuid'] = $device_profile_uuid;
-					$array['devices'][0]['device_description'] = $device_description;
+					if (permission_exists('device_label')) {
+						$array['devices'][0]['device_label'] = $device_label;
+					}
+					if (permission_exists('device_user') && is_uuid($device_user_uuid)) {
+						$array['devices'][0]['device_user_uuid'] = $device_user_uuid;
+					}
+					if (permission_exists('device_username_password')) {
+						$array['devices'][0]['device_username'] = $device_username;
+						$array['devices'][0]['device_password'] = $device_password;
+					}
+					if (permission_exists('device_vendor')) {
+						$array['devices'][0]['device_vendor'] = $device_vendor;
+					}
+					if (permission_exists('device_alternate') && is_uuid($device_uuid_alternate)) {
+						$array['devices'][0]['device_uuid_alternate'] = $device_uuid_alternate;
+					}
+					if (permission_exists('device_model')) {
+						$array['devices'][0]['device_model'] = $device_model;
+					}
+					if (permission_exists('device_firmware')) {
+						$array['devices'][0]['device_firmware_version'] = $device_firmware_version;
+					}
+					if (permission_exists('device_enable')) {
+						$array['devices'][0]['device_enabled'] = $device_enabled;
+						$array['devices'][0]['device_enabled_date'] = 'now()';
+					}
+					if (permission_exists('device_template')) {
+						$array['devices'][0]['device_template'] = $device_template;
+					}
+					if (permission_exists('device_profile_edit') && is_uuid($device_profile_uuid)) {
+						$array['devices'][0]['device_profile_uuid'] = $device_profile_uuid;
+					}
+					if (permission_exists('device_description')) {
+						$array['devices'][0]['device_description'] = $device_description;
+					}
 
-					$y = 0;
-					foreach ($device_lines as $row) {
-						if (strlen($row['line_number']) > 0) {
-							if (is_uuid($row["device_line_uuid"])) {
-								$device_line_uuid = $row["device_line_uuid"];
+					if (permission_exists('device_line_edit')) {
+						$y = 0;
+						foreach ($device_lines as $row) {
+							if (strlen($row['line_number']) > 0) {
+								if (is_uuid($row["device_line_uuid"])) {
+									$device_line_uuid = $row["device_line_uuid"];
+								}
+								else {
+									$device_line_uuid = uuid();
+								}
+								$array['devices'][0]['device_lines'][$y]['domain_uuid'] = $domain_uuid;
+								$array['devices'][0]['device_lines'][$y]['device_uuid'] = $device_uuid;
+								$array['devices'][0]['device_lines'][$y]['device_line_uuid'] = $device_line_uuid;
+								$array['devices'][0]['device_lines'][$y]['line_number'] = $row["line_number"];
+								$array['devices'][0]['device_lines'][$y]['server_address'] = $row["server_address"];
+								if (permission_exists('device_line_outbound_proxy_primary')) {
+									$array['devices'][0]['device_lines'][$y]['outbound_proxy_primary'] = $row["outbound_proxy_primary"];
+								}
+								if (permission_exists('device_line_outbound_proxy_secondary')) {
+									$array['devices'][0]['device_lines'][$y]['outbound_proxy_secondary'] = $row["outbound_proxy_secondary"];
+								}
+								if (permission_exists('device_line_server_address_primary')) {
+									$array['devices'][0]['device_lines'][$y]['server_address_primary'] = $row["server_address_primary"];
+								}
+								if (permission_exists('device_line_server_address_secondary')) {
+									$array['devices'][0]['device_lines'][$y]['server_address_secondary'] = $row["server_address_secondary"];
+								}
+								$array['devices'][0]['device_lines'][$y]['display_name'] = $row["display_name"];
+								$array['devices'][0]['device_lines'][$y]['user_id'] = $row["user_id"];
+								if (permission_exists('device_line_auth_id')) {
+									$array['devices'][0]['device_lines'][$y]['auth_id'] = $row["auth_id"];
+								}
+								if (permission_exists('device_line_password')) {
+									$array['devices'][0]['device_lines'][$y]['password'] = $row["password"];
+								}
+								$array['devices'][0]['device_lines'][$y]['shared_line'] = $row["shared_line"];
+								$array['devices'][0]['device_lines'][$y]['enabled'] = $row["enabled"];
+								$array['devices'][0]['device_lines'][$y]['sip_port'] = $row["sip_port"];
+								$array['devices'][0]['device_lines'][$y]['sip_transport'] = $row["sip_transport"];
+								$array['devices'][0]['device_lines'][$y]['register_expires'] = $row["register_expires"];
+								$y++;
 							}
-							else {
-								$device_line_uuid = uuid();
-							}
-							$array['devices'][0]['device_lines'][$y]['domain_uuid'] = $domain_uuid;
-							$array['devices'][0]['device_lines'][$y]['device_uuid'] = $device_uuid;
-							$array['devices'][0]['device_lines'][$y]['device_line_uuid'] = $device_line_uuid;
-							$array['devices'][0]['device_lines'][$y]['line_number'] = $row["line_number"];
-							$array['devices'][0]['device_lines'][$y]['server_address'] = $row["server_address"];
-							$array['devices'][0]['device_lines'][$y]['outbound_proxy_primary'] = $row["outbound_proxy_primary"];
-							$array['devices'][0]['device_lines'][$y]['outbound_proxy_secondary'] = $row["outbound_proxy_secondary"];
-							$array['devices'][0]['device_lines'][$y]['server_address_primary'] = $row["server_address_primary"];
-							$array['devices'][0]['device_lines'][$y]['server_address_secondary'] = $row["server_address_secondary"];
-							$array['devices'][0]['device_lines'][$y]['display_name'] = $row["display_name"];
-							$array['devices'][0]['device_lines'][$y]['user_id'] = $row["user_id"];
-							$array['devices'][0]['device_lines'][$y]['auth_id'] = $row["auth_id"];
-							$array['devices'][0]['device_lines'][$y]['password'] = $row["password"];
-							$array['devices'][0]['device_lines'][$y]['shared_line'] = $row["shared_line"];
-							$array['devices'][0]['device_lines'][$y]['enabled'] = $row["enabled"];
-							$array['devices'][0]['device_lines'][$y]['sip_port'] = $row["sip_port"];
-							$array['devices'][0]['device_lines'][$y]['sip_transport'] = $row["sip_transport"];
-							$array['devices'][0]['device_lines'][$y]['register_expires'] = $row["register_expires"];
-							$y++;
 						}
 					}
 
-					$y = 0;
-					foreach ($device_keys as $row) {
-						if (strlen($row['device_key_category']) > 0) {
-							if (is_uuid($row["device_key_uuid"])) {
-								$device_key_uuid = $row["device_key_uuid"];
+					if (permission_exists('device_key_edit')) {
+						$y = 0;
+						foreach ($device_keys as $row) {
+							if (strlen($row['device_key_category']) > 0) {
+								if (is_uuid($row["device_key_uuid"])) {
+									$device_key_uuid = $row["device_key_uuid"];
+								}
+								else {
+									$device_key_uuid = uuid();
+								}
+								$array['devices'][0]['device_keys'][$y]['domain_uuid'] = $domain_uuid;
+								$array['devices'][0]['device_keys'][$y]['device_uuid'] = $device_uuid;
+								$array['devices'][0]['device_keys'][$y]['device_key_uuid'] = $device_key_uuid;
+								$array['devices'][0]['device_keys'][$y]['device_key_category'] = $row["device_key_category"];
+								$array['devices'][0]['device_keys'][$y]['device_key_vendor'] = $row["device_key_vendor"];
+								if (permission_exists('device_key_id')) {
+									$array['devices'][0]['device_keys'][$y]['device_key_id'] = $row["device_key_id"];
+								}
+								$array['devices'][0]['device_keys'][$y]['device_key_type'] = $row["device_key_type"];
+								if (permission_exists('device_key_line')) {
+									$array['devices'][0]['device_keys'][$y]['device_key_line'] = $row["device_key_line"];
+								}
+								$array['devices'][0]['device_keys'][$y]['device_key_value'] = $row["device_key_value"];
+								if (permission_exists('device_key_extension')) {
+									$array['devices'][0]['device_keys'][$y]['device_key_extension'] = $row["device_key_extension"];
+								}
+								//$array['devices'][0]['device_keys'][$y]['device_key_protected'] = $row["device_key_protected"];
+								$array['devices'][0]['device_keys'][$y]['device_key_label'] = $row["device_key_label"];
+								$array['devices'][0]['device_keys'][$y]['device_key_icon'] = $row["device_key_icon"];
+								$y++;
 							}
-							else {
-								$device_key_uuid = uuid();
-							}
-							$array['devices'][0]['device_keys'][$y]['domain_uuid'] = $domain_uuid;
-							$array['devices'][0]['device_keys'][$y]['device_uuid'] = $device_uuid;
-							$array['devices'][0]['device_keys'][$y]['device_key_uuid'] = $device_key_uuid;
-							$array['devices'][0]['device_keys'][$y]['device_key_category'] = $row["device_key_category"];
-							$array['devices'][0]['device_keys'][$y]['device_key_vendor'] = $row["device_key_vendor"];
-							$array['devices'][0]['device_keys'][$y]['device_key_id'] = $row["device_key_id"];
-							$array['devices'][0]['device_keys'][$y]['device_key_type'] = $row["device_key_type"];
-							$array['devices'][0]['device_keys'][$y]['device_key_line'] = $row["device_key_line"];
-							$array['devices'][0]['device_keys'][$y]['device_key_value'] = $row["device_key_value"];
-							$array['devices'][0]['device_keys'][$y]['device_key_extension'] = $row["device_key_extension"];
-							//$array['devices'][0]['device_keys'][$y]['device_key_protected'] = $row["device_key_protected"];
-							$array['devices'][0]['device_keys'][$y]['device_key_label'] = $row["device_key_label"];
-							$array['devices'][0]['device_keys'][$y]['device_key_icon'] = $row["device_key_icon"];
-							$y++;
 						}
 					}
 
-					$y = 0;
-					foreach ($device_settings as $row) {
-						if (strlen($row['device_setting_subcategory']) > 0) {
-							if (is_uuid($row["device_setting_uuid"])) {
-								$device_setting_uuid = $row["device_setting_uuid"];
+					if (permission_exists('device_setting_edit')) {
+						$y = 0;
+						foreach ($device_settings as $row) {
+							if (strlen($row['device_setting_subcategory']) > 0) {
+								if (is_uuid($row["device_setting_uuid"])) {
+									$device_setting_uuid = $row["device_setting_uuid"];
+								}
+								else {
+									$device_setting_uuid = uuid();
+								}
+								$array['devices'][0]['device_settings'][$y]['domain_uuid'] = $domain_uuid;
+								$array['devices'][0]['device_settings'][$y]['device_uuid'] = $device_uuid;
+								$array['devices'][0]['device_settings'][$y]['device_setting_uuid'] = $device_setting_uuid;
+								$array['devices'][0]['device_settings'][$y]['device_setting_category'] = $row["device_setting_category"];
+								$array['devices'][0]['device_settings'][$y]['device_setting_subcategory'] = $row["device_setting_subcategory"];
+								$array['devices'][0]['device_settings'][$y]['device_setting_name'] = $row["device_setting_name"];
+								$array['devices'][0]['device_settings'][$y]['device_setting_value'] = $row["device_setting_value"];
+								$array['devices'][0]['device_settings'][$y]['device_setting_enabled'] = $row["device_setting_enabled"];
+								$array['devices'][0]['device_settings'][$y]['device_setting_description'] = $row["device_setting_description"];
+								$y++;
 							}
-							else {
-								$device_setting_uuid = uuid();
-							}
-							$array['devices'][0]['device_settings'][$y]['domain_uuid'] = $domain_uuid;
-							$array['devices'][0]['device_settings'][$y]['device_uuid'] = $device_uuid;
-							$array['devices'][0]['device_settings'][$y]['device_setting_uuid'] = $device_setting_uuid;
-							$array['devices'][0]['device_settings'][$y]['device_setting_category'] = $row["device_setting_category"];
-							$array['devices'][0]['device_settings'][$y]['device_setting_subcategory'] = $row["device_setting_subcategory"];
-							$array['devices'][0]['device_settings'][$y]['device_setting_name'] = $row["device_setting_name"];
-							$array['devices'][0]['device_settings'][$y]['device_setting_value'] = $row["device_setting_value"];
-							$array['devices'][0]['device_settings'][$y]['device_setting_enabled'] = $row["device_setting_enabled"];
-							$array['devices'][0]['device_settings'][$y]['device_setting_description'] = $row["device_setting_description"];
-							$y++;
 						}
 					}
 
@@ -906,7 +951,7 @@
 		echo "</tr>\n";
 	}
 
-	if (permission_exists('device_line_view')) {
+	if (permission_exists('device_line_edit')) {
 		echo "	<tr>";
 		echo "		<td class='vncell' valign='top'>".$text['label-lines']."</td>";
 		echo "		<td class='vtable' align='left'>";
@@ -1159,9 +1204,13 @@
 		if ($vendor_count == 0) {
 			echo "			<tr>\n";
 			echo "				<td class='vtable'>".$text['label-device_key_category']."</td>\n";
-			echo "				<td class='vtable'>".$text['label-device_key_id']."</td>\n";
+			if (permission_exists('device_key_id')) {
+				echo "				<td class='vtable'>".$text['label-device_key_id']."</td>\n";
+			}
 			echo "				<td class='vtable'>".$text['label-device_key_type']."</td>\n";
-			echo "				<td class='vtable'>".$text['label-device_key_line']."</td>\n";
+			if (permission_exists('device_key_line')) {
+				echo "				<td class='vtable'>".$text['label-device_key_line']."</td>\n";
+			}
 			echo "				<td class='vtable'>".$text['label-device_key_value']."</td>\n";
 			if (permission_exists('device_key_extension')) {
 				echo "				<td class='vtable'>".$text['label-device_key_extension']."</td>\n";
@@ -1183,13 +1232,17 @@
 				if ($previous_device_key_vendor != $row['device_key_vendor']) {
 					echo "			<tr>\n";
 					echo "				<td class='vtable'>".$text['label-device_key_category']."</td>\n";
-					echo "				<td class='vtable'>".$text['label-device_key_id']."</td>\n";
+					if (permission_exists('device_key_id')) {
+						echo "				<td class='vtable'>".$text['label-device_key_id']."</td>\n";
+					}
 					if ($vendor_count > 1 && strlen($row['device_key_vendor']) > 0) {
 						echo "				<td class='vtable'>".ucwords($row['device_key_vendor'])."</td>\n";
 					} else {
 						echo "				<td class='vtable'>".$text['label-device_key_type']."</td>\n";
 					}
-					echo "				<td class='vtable'>".$text['label-device_key_line']."</td>\n";
+					if (permission_exists('device_key_line')) {
+						echo "				<td class='vtable'>".$text['label-device_key_line']."</td>\n";
+					}
 					echo "				<td class='vtable'>".$text['label-device_key_value']."</td>\n";
 					if (permission_exists('device_key_extension')) {
 						echo "				<td class='vtable'>".$text['label-device_key_extension']."</td>\n";
@@ -1333,15 +1386,17 @@
 				echo "	</select>\n";
 				echo "</td>\n";
 
-				echo "<td valign='top' align='left' nowrap='nowrap'>\n";
-				$selected = "selected='selected'";
-				echo "	<select class='formfld' name='device_keys[".$x."][device_key_id]'>\n";
-				echo "	<option value=''></option>\n";
-				for ($i = 1; $i <= 255; $i++) {
-					echo "	<option value='$i' ".($row['device_key_id'] == $i ? "selected":null).">$i</option>\n";
+				if (permission_exists('device_key_id')) {
+					echo "<td valign='top' align='left' nowrap='nowrap'>\n";
+					$selected = "selected='selected'";
+					echo "	<select class='formfld' name='device_keys[".$x."][device_key_id]'>\n";
+					echo "	<option value=''></option>\n";
+					for ($i = 1; $i <= 255; $i++) {
+						echo "	<option value='$i' ".($row['device_key_id'] == $i ? "selected":null).">$i</option>\n";
+					}
+					echo "	</select>\n";
+					echo "</td>\n";
 				}
-				echo "	</select>\n";
-				echo "</td>\n";
 
 				echo "<td align='left' nowrap='nowrap'>\n";
 				//echo "	<input class='formfld' type='text' name='device_keys[".$x."][device_key_type]' style='width: 120px;' maxlength='255' value=\"$row['device_key_type']\">\n";
@@ -1381,14 +1436,16 @@
 				}
 				echo "</select>\n";
 				echo "</td>\n";
-				echo "<td valign='top' align='left' nowrap='nowrap'>\n";
-				echo "	<select class='formfld' name='device_keys[".$x."][device_key_line]'>\n";
-				echo "		<option value=''></option>\n";
-				for ($l = 0; $l <= 12; $l++) {
-					echo "	<option value='".$l."' ".(($row['device_key_line'] == $l) ? "selected='selected'" : null).">".$l."</option>\n";
+				if (permission_exists('device_key_line')) {
+					echo "<td valign='top' align='left' nowrap='nowrap'>\n";
+					echo "	<select class='formfld' name='device_keys[".$x."][device_key_line]'>\n";
+					echo "		<option value=''></option>\n";
+					for ($l = 0; $l <= 12; $l++) {
+						echo "	<option value='".$l."' ".(($row['device_key_line'] == $l) ? "selected='selected'" : null).">".$l."</option>\n";
+					}
+					echo "	</select>\n";
+					echo "</td>\n";
 				}
-				echo "	</select>\n";
-				echo "</td>\n";
 
 				echo "<td align='left'>\n";
 				echo "	<input class='formfld' type='text' name='device_keys[".$x."][device_key_value]' style='width: 120px;' maxlength='255' value=\"".escape($row['device_key_value'])."\"/>\n";

From 221560d0836a2562a6c84201f90e4508bc8a8a8c Mon Sep 17 00:00:00 2001
From: FusionPBX <markjcrane@gmail.com>
Date: Thu, 16 Apr 2020 14:36:00 -0600
Subject: [PATCH 04/30] Update switch.conf.xml

---
 resources/templates/conf/autoload_configs/switch.conf.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/templates/conf/autoload_configs/switch.conf.xml b/resources/templates/conf/autoload_configs/switch.conf.xml
index dbeee854aa..a543cfce7e 100644
--- a/resources/templates/conf/autoload_configs/switch.conf.xml
+++ b/resources/templates/conf/autoload_configs/switch.conf.xml
@@ -151,7 +151,7 @@
 		<!-- <param name="core-db-name" value="/dev/shm/core.db" /> -->
 
 		<!-- The system will create all the db schemas automatically, set this to false to avoid this behaviour -->
-		<!-- <param name="auto-create-schemas" value="true"/> -->
+		<param name="auto-create-schemas" value="true"/>
 		<!-- <param name="auto-clear-sql" value="true"/> -->
 		<!-- <param name="enable-early-hangup" value="true"/> -->
 

From aec01070494194ef497efe4dbc2f90880ce947bf Mon Sep 17 00:00:00 2001
From: FusionPBX <markjcrane@gmail.com>
Date: Thu, 16 Apr 2020 16:52:58 -0600
Subject: [PATCH 05/30] Update app_config.php

---
 core/users/app_config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/users/app_config.php b/core/users/app_config.php
index ab28445906..931b782218 100644
--- a/core/users/app_config.php
+++ b/core/users/app_config.php
@@ -99,7 +99,7 @@
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "users";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "password_length";
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
-		$apps[$x]['default_settings'][$y]['default_setting_value'] = "20";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "12";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "The default length of characters in a user password.";
 		$y++;

From b0abe3a5319c7cfeafeeb5cdb21f24616cc41c12 Mon Sep 17 00:00:00 2001
From: FusionPBX <markjcrane@gmail.com>
Date: Thu, 16 Apr 2020 17:05:07 -0600
Subject: [PATCH 06/30] Update user_edit.php

---
 core/users/user_edit.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/users/user_edit.php b/core/users/user_edit.php
index 8a2d3a27cd..b1e94d138f 100644
--- a/core/users/user_edit.php
+++ b/core/users/user_edit.php
@@ -1032,8 +1032,8 @@
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
 	echo "	<select class='formfld' name='user_enabled'>\n";
-	echo "		<option value='true'>".$text['option-true']."</option>\n";
-	echo "		<option value='false' ".(($user_enabled != "true") ? "selected='selected'" : null).">".$text['option-false']."</option>\n";
+	echo "		<option value='true' ".(($user_enabled == "true") ? "selected='selected'" : null).">".$text['option-true']."</option>\n";
+	echo "		<option value='false' ".(($user_enabled == "false") ? "selected='selected'" : null).">".$text['option-false']."</option>\n";
 	echo "	</select>\n";
 	echo "<br />\n";
 	echo $text['description-enabled']."\n";
@@ -1079,4 +1079,4 @@
 //include the footer
 	require_once "resources/footer.php";
 
-?>
\ No newline at end of file
+?>

From f8d4ff3fd3ca66ec4195df1968a230bada480a20 Mon Sep 17 00:00:00 2001
From: FusionPBX <markjcrane@gmail.com>
Date: Thu, 16 Apr 2020 17:07:07 -0600
Subject: [PATCH 07/30] Update app_config.php

---
 app/extensions/app_config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/extensions/app_config.php b/app/extensions/app_config.php
index 52edbc9356..b83732025c 100644
--- a/app/extensions/app_config.php
+++ b/app/extensions/app_config.php
@@ -230,7 +230,7 @@
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "extension";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "password_length";
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
-		$apps[$x]['default_settings'][$y]['default_setting_value'] = "10";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "20";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the length for generated passwords for extensions.";
 		$y++;

From ac85543881105a94bc8efd9cd5f8c32ca1090f2e Mon Sep 17 00:00:00 2001
From: FusionPBX <markjcrane@gmail.com>
Date: Thu, 16 Apr 2020 17:11:48 -0600
Subject: [PATCH 08/30] Update user_edit.php

---
 core/users/user_edit.php | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/core/users/user_edit.php b/core/users/user_edit.php
index b1e94d138f..f2e4a211ec 100644
--- a/core/users/user_edit.php
+++ b/core/users/user_edit.php
@@ -1059,16 +1059,7 @@
 	}
 
 	echo "<script>\n";
-//uuid generation script
-	echo "function uuid() {\n";
-	echo "	var d = new Date().getTime();\n";
-	echo "	var uuid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {\n";
-	echo "		var r = (d + Math.random()*16)%16 | 0;\n";
-	echo "		d = Math.floor(d/16);\n";
-	echo "		return (c=='x' ? r : (r&0x3|0x8)).toString(16);\n";
-	echo "	});\n";
-	echo "	return uuid;\n";
-	echo "};\n";
+
 //hide password fields before submit
 	echo "	function submit_form() {\n";
 	echo "		hide_password_fields();\n";

From 6677004b4141402fd42ae79f3f83db106c38ce6d Mon Sep 17 00:00:00 2001
From: FusionPBX <markjcrane@gmail.com>
Date: Thu, 16 Apr 2020 22:53:15 -0600
Subject: [PATCH 09/30] Update css.php

---
 themes/default/css.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/themes/default/css.php b/themes/default/css.php
index d08c7bf19d..28f0ed433c 100644
--- a/themes/default/css.php
+++ b/themes/default/css.php
@@ -984,17 +984,17 @@ header('Expires: '.gmdate('D, d M Y H:i:s',time()+3600).' GMT');
 		cursor: pointer;
 		}
 
-	div.domains_list_item span.domain_list_item_description, 
-	div.domains_list_item_active span.domain_list_item_description, 
+	div.domains_list_item span.domain_list_item_description,
+	div.domains_list_item_active span.domain_list_item_description,
 	div.domains_list_item_inactive span.domain_list_item_description,
-	
+
 	div.domains_list_item_active span.domain_active_list_item_description,
 	div.domains_list_item_inactive span.domain_inactive_list_item_description {
 		font-size: 11px;
 		}
 
-	div.domains_list_item span.domain_list_item_description, 
-	div.domains_list_item_active span.domain_list_item_description, 
+	div.domains_list_item span.domain_list_item_description,
+	div.domains_list_item_active span.domain_list_item_description,
 	div.domains_list_item_inactive span.domain_list_item_description {
 		color: #999;
 		}
@@ -1023,7 +1023,7 @@ header('Expires: '.gmdate('D, d M Y H:i:s',time()+3600).' GMT');
 	div.domains_list_item_active:hover span {
 		color: <?php echo ($_SESSION['theme']['domain_active_text_color_hover']['text']); ?>;
 	}
-	
+
 	div.domains_list_item_inactive:hover a,
 	div.domains_list_item_inactive:hover span {
 		color: <?php echo ($_SESSION['theme']['domain_inactive_text_color_hover']['text']); ?>;
@@ -2718,4 +2718,4 @@ header('Expires: '.gmdate('D, d M Y H:i:s',time()+3600).' GMT');
 		echo $_SESSION['theme']['custom_css_code']['text'];
 	}
 
-?>
\ No newline at end of file
+?>

From 39f4abfd37a95898690c2ede4f2251adfa6ef2fa Mon Sep 17 00:00:00 2001
From: FusionPBX <markjcrane@gmail.com>
Date: Fri, 17 Apr 2020 00:25:16 -0600
Subject: [PATCH 10/30] Update app_config.php

---
 core/domains/app_config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/domains/app_config.php b/core/domains/app_config.php
index 39cc8018fc..b49bdb6f7e 100644
--- a/core/domains/app_config.php
+++ b/core/domains/app_config.php
@@ -1,5 +1,5 @@
 <?php
-	
+
 	//application details
 		$apps[$x]['name'] = "Domains";
 		$apps[$x]['guid'] = "8b91605b-f6d2-42e6-a56d-5d1ded01bb44";

From 81f665c65a74918bf74a0a33ed3bfc99adc42945 Mon Sep 17 00:00:00 2001
From: FusionPBX <markjcrane@gmail.com>
Date: Fri, 17 Apr 2020 12:06:50 -0600
Subject: [PATCH 11/30] Update xml_cdr.php

---
 app/xml_cdr/xml_cdr.php | 39 ++-------------------------------------
 1 file changed, 2 insertions(+), 37 deletions(-)

diff --git a/app/xml_cdr/xml_cdr.php b/app/xml_cdr/xml_cdr.php
index 2663f7658f..1c25691826 100644
--- a/app/xml_cdr/xml_cdr.php
+++ b/app/xml_cdr/xml_cdr.php
@@ -742,48 +742,13 @@
 					}
 				//destination
 					if (permission_exists('xml_cdr_destination')) {
-						if ($_SESSION['cdr']['remove_prefix']['boolean'] == 'true') {
-							//get outbound prefix variable from json table if exists
-							$json_string = trim($row["json"]);
-							$array = json_decode($json_string,true);
-							$remove_prefix = false;
-							$prefix = false;
-							if (is_array($array["app_log"]["application"])) {
-								foreach ($array["app_log"]["application"] as $application) {
-									$app_data = urldecode($application["@attributes"]["app_data"]);
-									if (substr($app_data,0,7) == "prefix=") {
-										$prefix = substr($app_data,7);
-										$remove_prefix = true;
-									}
-								}
-							}
-						}
 						$content .= "	<td class='middle no-link no-wrap'>";
 						$content .= "		<a href=\"javascript:void(0)\" onclick=\"send_cmd('".PROJECT_PATH."/app/click_to_call/click_to_call.php?src_cid_name=".urlencode(escape($row['destination_number']))."&src_cid_number=".urlencode(escape($row['destination_number']))."&dest_cid_name=".urlencode($_SESSION['user']['extension'][0]['outbound_caller_id_name'])."&dest_cid_number=".urlencode($_SESSION['user']['extension'][0]['outbound_caller_id_number'])."&src=".urlencode($_SESSION['user']['extension'][0]['user'])."&dest=".urlencode(escape($row['destination_number']))."&rec=false&ringback=us-ring&auto_answer=true');\">\n";
 						if (is_numeric($row['destination_number'])) {
-							if ($prefix) {
-								//confirms call was made with a prefix
-								$is_prefixed = substr(format_phone(escape(substr($row['destination_number'], 0, 20))),0,strlen($prefix));
-
-								//remove the prefix
-								if ($prefix == $is_prefixed) {
-									$content .= substr(format_phone(escape(substr($row['destination_number'], 0, 20))),strlen($prefix))."\n";
-								}
-								else {
-									$content .= format_phone(escape(substr($row['destination_number'], 0, 20)))."\n";
-								}
-							}
-							else {
-								$content .= format_phone(escape(substr($row['destination_number'], 0, 20)))."\n";
-							}
+							$content .= format_phone(escape(substr($row['destination_number'], 0, 20)))."\n";
 						}
 						else {
-								if ($remove_prefix == 'true') {
-									$content .= substr(format_phone(escape(substr($row['destination_number'], 0, 20))),strlen($prefix))."\n";
-								}
-								else {
-									$content .= format_phone(escape(substr($row['destination_number'], 0, 20)))."\n";
-								}
+							$content .= escape(substr($row['destination_number'], 0, 20))."\n";
 						}
 						$content .= "		</a>\n";
 						$content .= "	</td>\n";

From 0028e9cf504c39063bd4a71d09226b585a9735fc Mon Sep 17 00:00:00 2001
From: FusionPBX <markjcrane@gmail.com>
Date: Fri, 17 Apr 2020 12:33:57 -0600
Subject: [PATCH 12/30] Update v_xml_cdr_import.php

---
 app/xml_cdr/v_xml_cdr_import.php | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/app/xml_cdr/v_xml_cdr_import.php b/app/xml_cdr/v_xml_cdr_import.php
index 73d2dbac93..37ad9b6eeb 100644
--- a/app/xml_cdr/v_xml_cdr_import.php
+++ b/app/xml_cdr/v_xml_cdr_import.php
@@ -138,6 +138,7 @@
 
 		//caller info
 			$database->fields['caller_destination'] = urldecode($xml->variables->caller_destination);
+
 		//misc
 			$uuid = urldecode($xml->variables->uuid);
 			$database->fields['xml_cdr_uuid'] = $uuid;
@@ -147,6 +148,7 @@
 			//$database->fields['digits_dialed'] = urldecode($xml->variables->digits_dialed);
 			$database->fields['sip_hangup_disposition'] = urldecode($xml->variables->sip_hangup_disposition);
 			$database->fields['pin_number'] = urldecode($xml->variables->pin_number);
+
 		//time
 			$database->fields['start_epoch'] = urldecode($xml->variables->start_epoch);
 			$start_stamp = urldecode($xml->variables->start_stamp);
@@ -159,6 +161,7 @@
 			$database->fields['mduration'] = urldecode($xml->variables->mduration);
 			$database->fields['billsec'] = urldecode($xml->variables->billsec);
 			$database->fields['billmsec'] = urldecode($xml->variables->billmsec);
+
 		//codecs
 			$database->fields['read_codec'] = urldecode($xml->variables->read_codec);
 			$database->fields['read_rate'] = urldecode($xml->variables->read_rate);
@@ -167,6 +170,7 @@
 			$database->fields['remote_media_ip'] = urldecode($xml->variables->remote_media_ip);
 			$database->fields['hangup_cause'] = urldecode($xml->variables->hangup_cause);
 			$database->fields['hangup_cause_q850'] = urldecode($xml->variables->hangup_cause_q850);
+
 		//call center
 			$database->fields['cc_side'] = urldecode($xml->variables->cc_side);
 			$database->fields['cc_member_uuid'] = urldecode($xml->variables->cc_member_uuid);
@@ -183,13 +187,16 @@
 			$database->fields['cc_cancel_reason'] = urldecode($xml->variables->cc_cancel_reason);
 			$database->fields['cc_cause'] = urldecode($xml->variables->cc_cause);
 			$database->fields['waitsec'] = urldecode($xml->variables->waitsec);
+
 		//app info
 			$database->fields['last_app'] = urldecode($xml->variables->last_app);
 			$database->fields['last_arg'] = urldecode($xml->variables->last_arg);
+
 		//conference
 			$database->fields['conference_name'] = urldecode($xml->variables->conference_name);
 			$database->fields['conference_uuid'] = urldecode($xml->variables->conference_uuid);
 			$database->fields['conference_member_id'] = urldecode($xml->variables->conference_member_id);
+
 		//call quality
 			$rtp_audio_in_mos = urldecode($xml->variables->rtp_audio_in_mos);
 			if (strlen($rtp_audio_in_mos) > 0) {
@@ -222,7 +229,12 @@
 			foreach ($xml->callflow as $row) {
 				if ($i == 0) {
 					$context = urldecode($row->caller_profile->context);
-					$database->fields['destination_number'] = urldecode($row->caller_profile->destination_number);
+					$destination_number = urldecode($row->caller_profile->destination_number);
+					if (isset($xml->variables->provider_prefix) && isset($destination_number)) {
+						$provider_prefix = $xml->variables->provider_prefix;
+						$destination_number = substr($destination_number, strlen($provider_prefix), strlen($destination_number));
+					}
+					$database->fields['destination_number'] = $destination_number;
 					$database->fields['context'] = $context;
 					$database->fields['network_addr'] = urldecode($row->caller_profile->network_addr);
 				}
@@ -238,7 +250,12 @@
 
 		//if last_sent_callee_id_number is set use it for the destination_number
 			if (($leg == 'a') && (strlen($xml->variables->last_sent_callee_id_number) > 0)) {
-				$database->fields['destination_number'] = urldecode($xml->variables->last_sent_callee_id_number);
+				$destination_number = urldecode($xml->variables->last_sent_callee_id_number);
+				if (isset($xml->variables->provider_prefix) && isset($destination_number)) {
+					$provider_prefix = $xml->variables->provider_prefix;
+					$destination_number = substr($destination_number, strlen($provider_prefix), strlen($destination_number));
+				}
+				$database->fields['destination_number'] = $destination_number;
 			}
 
 		//store the call leg
@@ -614,6 +631,7 @@
 					return;
 				}
 			}
+
 		//loop through all attribues
 			//foreach($xml->settings->param[1]->attributes() as $a => $b) {
 			//		echo $a,'="',$b,"\"<br />\n";
@@ -631,6 +649,7 @@
 			}
 
 			xml_cdr_log("process cdr via post\n");
+
 		//parse the xml and insert the data into the db
 			process_xml_cdr($db, $leg, $xml_string);
 	}

From f18e5788927ac0878a7ccf658b68313c57e21445 Mon Sep 17 00:00:00 2001
From: FusionPBX <markjcrane@gmail.com>
Date: Fri, 17 Apr 2020 12:51:49 -0600
Subject: [PATCH 13/30] Update v_xml_cdr_import.php

---
 app/xml_cdr/v_xml_cdr_import.php | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/xml_cdr/v_xml_cdr_import.php b/app/xml_cdr/v_xml_cdr_import.php
index 37ad9b6eeb..58535cb6d5 100644
--- a/app/xml_cdr/v_xml_cdr_import.php
+++ b/app/xml_cdr/v_xml_cdr_import.php
@@ -230,11 +230,6 @@
 				if ($i == 0) {
 					$context = urldecode($row->caller_profile->context);
 					$destination_number = urldecode($row->caller_profile->destination_number);
-					if (isset($xml->variables->provider_prefix) && isset($destination_number)) {
-						$provider_prefix = $xml->variables->provider_prefix;
-						$destination_number = substr($destination_number, strlen($provider_prefix), strlen($destination_number));
-					}
-					$database->fields['destination_number'] = $destination_number;
 					$database->fields['context'] = $context;
 					$database->fields['network_addr'] = urldecode($row->caller_profile->network_addr);
 				}
@@ -251,13 +246,19 @@
 		//if last_sent_callee_id_number is set use it for the destination_number
 			if (($leg == 'a') && (strlen($xml->variables->last_sent_callee_id_number) > 0)) {
 				$destination_number = urldecode($xml->variables->last_sent_callee_id_number);
-				if (isset($xml->variables->provider_prefix) && isset($destination_number)) {
-					$provider_prefix = $xml->variables->provider_prefix;
+			}
+
+		//remove the provider prefix
+			if (isset($xml->variables->provider_prefix) && isset($destination_number)) {
+				$provider_prefix = $xml->variables->provider_prefix;
+				if ($provider_prefix == substr($destination_number, 0, strlen($provider_prefix))) {
 					$destination_number = substr($destination_number, strlen($provider_prefix), strlen($destination_number));
 				}
-				$database->fields['destination_number'] = $destination_number;
 			}
 
+		//store the destination_number
+			$database->fields['destination_number'] = $destination_number;
+
 		//store the call leg
 			$database->fields['leg'] = $leg;
 

From 4c34f3d4beeb4d4d5b49de30226432f32bd65581 Mon Sep 17 00:00:00 2001
From: FusionPBX <markjcrane@gmail.com>
Date: Fri, 17 Apr 2020 12:53:50 -0600
Subject: [PATCH 14/30] Update xml_cdr.php

---
 app/xml_cdr/resources/classes/xml_cdr.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/xml_cdr/resources/classes/xml_cdr.php b/app/xml_cdr/resources/classes/xml_cdr.php
index 8f15e920c8..3880ab4591 100644
--- a/app/xml_cdr/resources/classes/xml_cdr.php
+++ b/app/xml_cdr/resources/classes/xml_cdr.php
@@ -303,6 +303,14 @@ if (!class_exists('xml_cdr')) {
 							$destination_number = urldecode($xml->variables->last_sent_callee_id_number);
 						}
 
+					//remove the provider prefix
+						if (isset($xml->variables->provider_prefix) && isset($destination_number)) {
+							$provider_prefix = $xml->variables->provider_prefix;
+							if ($provider_prefix == substr($destination_number, 0, strlen($provider_prefix))) {
+								$destination_number = substr($destination_number, strlen($provider_prefix), strlen($destination_number));
+							}
+						}
+
 					//set missed calls
 						$missed_call = 'false';
 						if ($xml->variables->call_direction == 'local' || $xml->variables->call_direction == 'inbound') {

From af3eb82f0fb1191d056f9e65e8f0681e8f39eca2 Mon Sep 17 00:00:00 2001
From: FusionPBX <markjcrane@gmail.com>
Date: Fri, 17 Apr 2020 13:18:07 -0600
Subject: [PATCH 15/30] Update app_config.php

---
 app/xml_cdr/app_config.php | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/app/xml_cdr/app_config.php b/app/xml_cdr/app_config.php
index b393a7adc9..a6fa04e325 100644
--- a/app/xml_cdr/app_config.php
+++ b/app/xml_cdr/app_config.php
@@ -243,14 +243,6 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "";
 		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "53c56ddb-bd20-4fbd-b646-1ca9f8d2af11";
-		$apps[$x]['default_settings'][$y]['default_setting_category'] = "cdr";
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "remove_prefix";
-		$apps[$x]['default_settings'][$y]['default_setting_name'] = "boolean";
-		$apps[$x]['default_settings'][$y]['default_setting_value'] = "false";
-		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Remove outbound prefix in the call detail records.";
-		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "cdb19dda-234b-407a-9eda-e8af74597d4b";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "cdr";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "limit";

From 11a0464d891ffe6b27403bcade579237beb3a1d0 Mon Sep 17 00:00:00 2001
From: FusionPBX <markjcrane@gmail.com>
Date: Fri, 17 Apr 2020 14:01:34 -0600
Subject: [PATCH 16/30] Update dialplan_outbound_add.php

---
 .../dialplan_outbound_add.php                 | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/app/dialplan_outbound/dialplan_outbound_add.php b/app/dialplan_outbound/dialplan_outbound_add.php
index f3f81b6447..41d0a5f97d 100644
--- a/app/dialplan_outbound/dialplan_outbound_add.php
+++ b/app/dialplan_outbound/dialplan_outbound_add.php
@@ -626,18 +626,16 @@
 							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_group'] = '0';
 						}
 
-						if (strlen($prefix_number) > 0) {
-							if ($_SESSION['cdr']['remove_prefix']['boolean'] == 'true') {
-								$y++;
-								$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_uuid'] = uuid();
-								$array['dialplans'][$x]['dialplan_details'][$y]['domain_uuid'] = $_SESSION['domain_uuid'];
-								$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_uuid'] = $dialplan_uuid;
-								$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_tag'] = 'action';
-								$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_type'] = 'set';
-								$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_data'] = 'prefix='.$prefix_number;
-								$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_order'] = $y * 10;
-								$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_group'] = '0';
-							}
+						if (strlen($prefix_number) > 2) {
+							$y++;
+							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_uuid'] = uuid();
+							$array['dialplans'][$x]['dialplan_details'][$y]['domain_uuid'] = $_SESSION['domain_uuid'];
+							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_uuid'] = $dialplan_uuid;
+							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_tag'] = 'action';
+							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_type'] = 'set';
+							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_data'] = 'provider_prefix='.$prefix_number;
+							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_order'] = $y * 10;
+							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_group'] = '0';
 						}
 
 						if ($gateway_type == "transfer") { $dialplan_detail_type = 'transfer'; } else { $dialplan_detail_type = 'bridge'; }

From 755fa078d5b11ccec99faf088376aeedc7e26e88 Mon Sep 17 00:00:00 2001
From: agree <37550360+greenbea@users.noreply.github.com>
Date: Fri, 17 Apr 2020 16:06:54 -0400
Subject: [PATCH 17/30] Fixed group_confirm_key for rollover strategy  (#5236)

* Update index.lua
---
 .../resources/scripts/app/ring_groups/index.lua      | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/app/scripts/resources/scripts/app/ring_groups/index.lua b/app/scripts/resources/scripts/app/ring_groups/index.lua
index 226e1e2732..7b4d35f90a 100644
--- a/app/scripts/resources/scripts/app/ring_groups/index.lua
+++ b/app/scripts/resources/scripts/app/ring_groups/index.lua
@@ -903,6 +903,18 @@
 								user_exists = row.user_exists;
 								destination_number = row.destination_number;
 								domain_name = row.domain_name;
+								destination_prompt = row.destination_prompt;
+
+							--determine confirm prompt
+								if (destination_prompt == nil) then
+									group_confirm = "confirm=false,";
+								elseif (destination_prompt == "1") then
+									group_confirm = "group_confirm_key=exec,group_confirm_file=lua ".. scripts_dir:gsub('\\','/') .."/confirm.lua,confirm=true,";
+								elseif (destination_prompt == "2") then
+									group_confirm = "group_confirm_key=exec,group_confirm_file=lua ".. scripts_dir:gsub('\\','/') .."/confirm.lua,confirm=true,";
+								else
+									group_confirm = "confirm=false,";
+								end
 
 							--if the timeout was reached exit the loop and go to the timeout action
 								if (tonumber(ring_group_call_timeout) == timeout) then

From 6d4ad6358dba8ffa26993511f5389ac15379c841 Mon Sep 17 00:00:00 2001
From: FusionPBX <markjcrane@gmail.com>
Date: Fri, 17 Apr 2020 16:27:45 -0600
Subject: [PATCH 18/30] Update callcenter.conf.lua

---
 .../resources/scripts/configuration/callcenter.conf.lua     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/scripts/resources/scripts/app/xml_handler/resources/scripts/configuration/callcenter.conf.lua b/app/scripts/resources/scripts/app/xml_handler/resources/scripts/configuration/callcenter.conf.lua
index 25b561c957..3b25f0e370 100644
--- a/app/scripts/resources/scripts/app/xml_handler/resources/scripts/configuration/callcenter.conf.lua
+++ b/app/scripts/resources/scripts/app/xml_handler/resources/scripts/configuration/callcenter.conf.lua
@@ -1,6 +1,6 @@
 --      xml_handler.lua
 --      Part of FusionPBX
---      Copyright (C) 2015-2018 Mark J Crane <markjcrane@fusionpbx.com>
+--      Copyright (C) 2015-2020 Mark J Crane <markjcrane@fusionpbx.com>
 --      All rights reserved.
 --
 --      Redistribution and use in source and binary forms, with or without
@@ -184,14 +184,14 @@
 							--not found
 							if (string.find(agent_contact, 'sofia/gateway') == nil) then
 								--add the call_timeout
-								agent_contact = "{call_timeout="..agent_call_timeout..",sip_h_caller_destination=${caller_destination}}"..agent_contact;
+								agent_contact = "{call_timeout="..agent_call_timeout..",domain_name="..domain_name..",domain_uuid="..domain_uuid..",sip_h_caller_destination=${caller_destination}}"..agent_contact;
 							else
 								--add the call_timeout and confirm
 								tmp_pos = string.find(agent_contact, "}");
 								tmp_first = string.sub(agent_contact, 0, tmp_pos);
 								tmp_last = string.sub(agent_contact, tmp_pos);
 								agent_contact = tmp_first..',call_timeout='..agent_call_timeout..tmp_last;
-								agent_contact = "{"..confirm..",call_timeout="..agent_call_timeout..",sip_h_caller_destination=${caller_destination}}"..agent_contact;
+								agent_contact = "{"..confirm..",call_timeout="..agent_call_timeout..",domain_name="..domain_name..",domain_uuid="..domain_uuid..",sip_h_caller_destination=${caller_destination}}"..agent_contact;
 							end
 						else
 							--found

From e6d95500fb4af2d87d525b5f733e6b9536169dcb Mon Sep 17 00:00:00 2001
From: FusionPBX <markjcrane@gmail.com>
Date: Fri, 17 Apr 2020 16:43:57 -0600
Subject: [PATCH 19/30] Update app_config.php

---
 app/extensions/app_config.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/extensions/app_config.php b/app/extensions/app_config.php
index b83732025c..b8709831ee 100644
--- a/app/extensions/app_config.php
+++ b/app/extensions/app_config.php
@@ -51,10 +51,10 @@
 		$apps[$x]['destinations'][$y]['sql'] = "select extension, number_alias, user_context as context, description from v_extensions ";
 		$apps[$x]['destinations'][$y]['where'] = "where domain_uuid = '\${domain_uuid}' and enabled = 'true' ";
 		$apps[$x]['destinations'][$y]['order_by'] = "number_alias, extension asc";
-		//$apps[$x]['destinations'][$y]['field']['context'] = "user_context";
 		$apps[$x]['destinations'][$y]['field']['destination'] = "number_alias,extension";
+		$apps[$x]['destinations'][$y]['field']['context'] = "user_context";
 		$apps[$x]['destinations'][$y]['field']['description'] = "description";
-		$apps[$x]['destinations'][$y]['select_value']['user_contact'] = "loopback/\${destination}";
+		$apps[$x]['destinations'][$y]['select_value']['user_contact'] = "loopback/\${destination}/\${context}";
 		$apps[$x]['destinations'][$y]['select_label'] = "\${destination} \${description}";
 		$y++;
 		$apps[$x]['destinations'][$y]['type'] = "sql";

From 70755ccd507a336df91dfb1c80497e50a7cfa175 Mon Sep 17 00:00:00 2001
From: FusionPBX <markjcrane@gmail.com>
Date: Fri, 17 Apr 2020 16:57:17 -0600
Subject: [PATCH 20/30] Update app_config.php

---
 core/users/app_config.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/users/app_config.php b/core/users/app_config.php
index 931b782218..845d0cbd71 100644
--- a/core/users/app_config.php
+++ b/core/users/app_config.php
@@ -80,7 +80,6 @@
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "api_key";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
-		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "view_users";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";

From 789dadf5797613fbd79fb5190fcba3edc0efcf09 Mon Sep 17 00:00:00 2001
From: FusionPBX <markjcrane@gmail.com>
Date: Fri, 17 Apr 2020 16:58:57 -0600
Subject: [PATCH 21/30] Update user_edit.php

---
 core/users/user_edit.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/users/user_edit.php b/core/users/user_edit.php
index f2e4a211ec..63b141361d 100644
--- a/core/users/user_edit.php
+++ b/core/users/user_edit.php
@@ -1013,7 +1013,7 @@
 		echo "	</tr>";
 	}
 
-	if (permission_exists('message_view')) {
+	if (permission_exists('message_key')) {
 		echo "	<tr>";
 		echo "		<td class='vncell' valign='top'>".$text['label-message_key']."</td>";
 		echo "		<td class='vtable'>\n";

From 340b32f092d0acd9e215714b5501f64a446ca6c4 Mon Sep 17 00:00:00 2001
From: FusionPBX <markjcrane@gmail.com>
Date: Fri, 17 Apr 2020 16:59:38 -0600
Subject: [PATCH 22/30] Update user_edit.php

---
 core/users/user_edit.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/users/user_edit.php b/core/users/user_edit.php
index 63b141361d..5001e2464f 100644
--- a/core/users/user_edit.php
+++ b/core/users/user_edit.php
@@ -136,7 +136,7 @@
 			$group_uuid_name = $_POST["group_uuid_name"];
 			$user_enabled = $_POST["user_enabled"];
 			$api_key = $_POST["api_key"];
-			if (permission_exists('message_view')) {
+			if (permission_exists('message_key')) {
 				$message_key = $_POST["message_key"];
 			}
 
@@ -329,7 +329,7 @@
 			unset($sql, $parameters, $row);
 
 		//check to see if message key is set
-			if (permission_exists('message_view')) {
+			if (permission_exists('message_key')) {
 				$sql = "select user_setting_uuid, user_setting_value from v_user_settings ";
 				$sql .= "where user_setting_category = 'message' ";
 				$sql .= "and user_setting_subcategory = 'key' ";

From a1a7268451c071fc2b30e2824650ffe9b29170e7 Mon Sep 17 00:00:00 2001
From: FusionPBX <markjcrane@gmail.com>
Date: Fri, 17 Apr 2020 17:01:14 -0600
Subject: [PATCH 23/30] Update app_config.php

---
 app/messages/app_config.php | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/app/messages/app_config.php b/app/messages/app_config.php
index c438211b23..5f8c733ab8 100644
--- a/app/messages/app_config.php
+++ b/app/messages/app_config.php
@@ -15,38 +15,33 @@
 		$y = 0;
 		$apps[$x]['permissions'][$y]['name'] = 'message_view';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = 'message_add';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = 'message_edit';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = 'message_delete';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = 'message_all';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = 'message_media_view';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = 'message_media_add';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = 'message_media_edit';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = 'message_media_delete';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
+		$y++;
+		$apps[$x]['permissions'][$y]['name'] = 'message_key';
+		//$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
 		$y++;
 
 	//messages table

From 848bb7df4b85a5d4c37e559f6b58491c1b3996cd Mon Sep 17 00:00:00 2001
From: FusionPBX <markjcrane@gmail.com>
Date: Fri, 17 Apr 2020 23:27:36 -0600
Subject: [PATCH 24/30] Update check_auth.php

---
 resources/check_auth.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/resources/check_auth.php b/resources/check_auth.php
index cbaa85e8e6..00d8b38b66 100644
--- a/resources/check_auth.php
+++ b/resources/check_auth.php
@@ -261,8 +261,10 @@
 					exit();
 				}
 				else if ($_SESSION['login']['destination']['url'] != '') {
-					header("Location: ".$_SESSION['login']['destination']['url']);
-					exit();
+					if (isset($_SESSION["username"]) && (strlen($_SESSION["username"]) > 0)) {
+						header("Location: ".$_SESSION['login']['destination']['url']);
+						exit();
+					}
 				}
 			}
 

From 49a94b8a1a43ea8b47f69e610f8df8fc31664b6a Mon Sep 17 00:00:00 2001
From: Nate <github@najo.com>
Date: Sat, 18 Apr 2020 14:09:10 -0600
Subject: [PATCH 25/30] MOH: Remove duplicate semi-colon from app_config.

---
 app/music_on_hold/app_config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/music_on_hold/app_config.php b/app/music_on_hold/app_config.php
index fcf9220ae6..de7f4489c9 100644
--- a/app/music_on_hold/app_config.php
+++ b/app/music_on_hold/app_config.php
@@ -3,7 +3,7 @@
 	//application details
 		$apps[$x]['name'] = "Music on Hold";
 		$apps[$x]['uuid'] = "1dafe0f8-c08a-289b-0312-15baf4f20f81";
-		$apps[$x]['category'] = "Switch";;
+		$apps[$x]['category'] = "Switch";
 		$apps[$x]['subcategory'] = "";
 		$apps[$x]['version'] = "1.0";
 		$apps[$x]['license'] = "Mozilla Public License 1.1";

From 35924fbb2fdb69da034e76d08be55aa806beb129 Mon Sep 17 00:00:00 2001
From: Nate <github@najo.com>
Date: Sat, 18 Apr 2020 14:09:51 -0600
Subject: [PATCH 26/30] Misc: Prep for future apps.

---
 core/users/app_languages.php | 23 ++++++++++++++++++++++-
 core/users/user_edit.php     | 12 +++++++++---
 resources/footer.php         |  9 +++++++++
 themes/default/template.php  |  3 +++
 4 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/core/users/app_languages.php b/core/users/app_languages.php
index 042afec136..163a9a27ce 100644
--- a/core/users/app_languages.php
+++ b/core/users/app_languages.php
@@ -2024,4 +2024,25 @@ $text['button-add_member']['ru-ru'] = "Добавить участника";
 $text['button-add_member']['sv-se'] = "Lägg Till Medlem";
 $text['button-add_member']['uk-ua'] = "Додати учасника";
 
-?>
+$text['button-permissions']['en-us'] = "Permissions";
+$text['button-permissions']['en-gb'] = "Permissions";
+$text['button-permissions']['ar-eg'] = "";
+$text['button-permissions']['de-at'] = "Berechtigungen"; //copied from de-de
+$text['button-permissions']['de-ch'] = "Berechtigungen"; //copied from de-de
+$text['button-permissions']['de-de'] = "Berechtigungen";
+$text['button-permissions']['es-cl'] = "Permisos";
+$text['button-permissions']['es-mx'] = "Permisos"; //copied from es-cl
+$text['button-permissions']['fr-ca'] = "Permissions"; //copied from fr-fr
+$text['button-permissions']['fr-fr'] = "Permissions";
+$text['button-permissions']['he-il'] = "הרשאות";
+$text['button-permissions']['it-it'] = "Permessi";
+$text['button-permissions']['nl-nl'] = "";
+$text['button-permissions']['pl-pl'] = "Uprawnienia";
+$text['button-permissions']['pt-br'] = "Permissões"; //copied from pt-pt
+$text['button-permissions']['pt-pt'] = "Permissões";
+$text['button-permissions']['ro-ro'] = "";
+$text['button-permissions']['ru-ru'] = "Права";
+$text['button-permissions']['sv-se'] = "Rättigheter";
+$text['button-permissions']['uk-ua'] = "Привілеї";
+
+?>
\ No newline at end of file
diff --git a/core/users/user_edit.php b/core/users/user_edit.php
index 5001e2464f..98f3df7344 100644
--- a/core/users/user_edit.php
+++ b/core/users/user_edit.php
@@ -670,12 +670,18 @@
 		echo "<div class='unsaved'>".$text['message-unsaved_changes']." <i class='fas fa-exclamation-triangle'></i></div>";
 	}
 	if (permission_exists('user_add') || permission_exists('user_edit')) {
-		echo button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>$_SESSION['theme']['button_icon_back'],'id'=>'btn_back','style'=>'margin-right: 15px;','link'=>'users.php']);
+		echo button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>$_SESSION['theme']['button_icon_back'],'id'=>'btn_back','link'=>'users.php']);
 	}
+	$button_margin = 'margin-left: 15px;';
 	if (permission_exists('ticket_add') || permission_exists('ticket_edit')) {
-		echo button::create(['type'=>'button','label'=>$text['button-tickets'],'icon'=>'tags','style'=>'margin-right: 15px;','link'=>PROJECT_PATH.'/app/tickets/tickets.php?user_uuid='.urlencode($user_uuid)]);
+		echo button::create(['type'=>'button','label'=>$text['button-tickets'],'icon'=>'tags','style'=>$button_margin,'link'=>PROJECT_PATH.'/app/tickets/tickets.php?user_uuid='.urlencode($user_uuid)]);
+		unset($button_margin);
 	}
-	echo button::create(['type'=>'button','label'=>$text['button-save'],'icon'=>$_SESSION['theme']['button_icon_save'],'id'=>'btn_save','onclick'=>'submit_form();']);
+	if (permission_exists('user_permissions') && file_exists('../../app/user_permissions/user_permissions.php')) {
+		echo button::create(['type'=>'button','label'=>$text['button-permissions'],'icon'=>'key','style'=>$button_margin,'link'=>PROJECT_PATH.'/app/user_permissions/user_permissions.php?id='.urlencode($user_uuid)]);
+		unset($button_margin);
+	}
+	echo button::create(['type'=>'button','label'=>$text['button-save'],'icon'=>$_SESSION['theme']['button_icon_save'],'id'=>'btn_save','style'=>'margin-left: 15px;','onclick'=>'submit_form();']);
 	echo "	</div>\n";
 	echo "	<div style='clear: both;'></div>\n";
 	echo "</div>\n";
diff --git a/resources/footer.php b/resources/footer.php
index d97013c398..0b94f30fe6 100644
--- a/resources/footer.php
+++ b/resources/footer.php
@@ -251,6 +251,15 @@
 		$view->assign('login_page', $login_page);
 	//messages
 		$view->assign('messages', message::html(true, '		'));
+	//session timer
+		if (
+			$authenticated &&
+			file_exists($_SERVER['DOCUMENT_ROOT'].PROJECT_PATH.'/app/session_timer/session_timer.php') &&
+			$_SESSION['security']['session_timer_enabled']['boolean'] == 'true'
+			) {
+			include_once PROJECT_PATH.'app/session_timer/session_timer.php';
+			$view->assign('session_timer', $session_timer);
+		}
 
 	//render the view
 		$output = $view->render('template.php');
diff --git a/themes/default/template.php b/themes/default/template.php
index 8f9f0ee07c..1eeb910705 100644
--- a/themes/default/template.php
+++ b/themes/default/template.php
@@ -802,6 +802,9 @@
 		});
 		{/literal}
 
+	{*//session timer *}
+		{$session_timer}
+
 	</script>
 
 </head>

From 2648ef26727193d299ef5af2acb2bcc3d21def67 Mon Sep 17 00:00:00 2001
From: Nate <github@najo.com>
Date: Sat, 18 Apr 2020 16:47:46 -0600
Subject: [PATCH 27/30] Functions: Increase TLD character length on email
 address validation.

---
 resources/functions.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/functions.php b/resources/functions.php
index a954b71943..6bb3113db6 100644
--- a/resources/functions.php
+++ b/resources/functions.php
@@ -1019,7 +1019,7 @@ function number_pad($number,$n) {
 // validate email address syntax
 	if(!function_exists('valid_email')) {
 		function valid_email($email) {
-			$regex = '/^[A-z0-9][\w.-]*@[A-z0-9][\w\-\.]+(\.[A-z0-9]{2,6})?$/';
+			$regex = '/^[A-z0-9][\w.-]*@[A-z0-9][\w\-\.]+(\.[A-z0-9]{2,7})?$/';
 			if ($email != "" && preg_match($regex, $email) == 1) {
 				return true; // email address has valid syntax
 			}
@@ -1349,7 +1349,7 @@ function number_pad($number,$n) {
 			include_once("resources/phpmailer/class.phpmailer.php");
 			include_once("resources/phpmailer/class.smtp.php");
 
-			$regexp = '/^[A-z0-9][\w.-]*@[A-z0-9][\w\-\.]+\.[A-z0-9]{2,6}$/';
+			$regexp = '/^[A-z0-9][\w.-]*@[A-z0-9][\w\-\.]+\.[A-z0-9]{2,7}$/';
 
 			$mail = new PHPMailer();
 			$mail -> IsSMTP();

From 1506505ec62cb1842820d3a063a47fee4d8aa91c Mon Sep 17 00:00:00 2001
From: FusionPBX <markjcrane@gmail.com>
Date: Sun, 19 Apr 2020 21:06:06 -0600
Subject: [PATCH 28/30] Update check_auth.php

---
 resources/check_auth.php | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/resources/check_auth.php b/resources/check_auth.php
index 00d8b38b66..82ff6090b6 100644
--- a/resources/check_auth.php
+++ b/resources/check_auth.php
@@ -39,7 +39,6 @@
 	if (!isset($_SESSION)) { session_start(); }
 
 //define variables
-	if (!isset($_SESSION['login']['destination']['url'])) { $_SESSION['login']['destination']['url'] = null; }
 	if (!isset($_SESSION['template_content'])) { $_SESSION["template_content"] = null; }
 
 //if the username is not provided then send to login.php
@@ -260,12 +259,6 @@
 					header("Location: ".$path);
 					exit();
 				}
-				else if ($_SESSION['login']['destination']['url'] != '') {
-					if (isset($_SESSION["username"]) && (strlen($_SESSION["username"]) > 0)) {
-						header("Location: ".$_SESSION['login']['destination']['url']);
-						exit();
-					}
-				}
 			}
 
 		//get the domains
@@ -286,9 +279,4 @@
 		date_default_timezone_set($_SESSION["time_zone"]["user"]);
 	}
 
-//hide the path unless logged in as a superadmin.
-	if (!if_group("superadmin")) {
-		$v_path_show = false;
-	}
-
 ?>

From 3d31bbac3514ab9f5ca4104663d62c31156ce0a2 Mon Sep 17 00:00:00 2001
From: FusionPBX <markjcrane@gmail.com>
Date: Tue, 21 Apr 2020 13:43:32 -0600
Subject: [PATCH 29/30] Update call_center_queue_edit.php

---
 app/call_centers/call_center_queue_edit.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/call_centers/call_center_queue_edit.php b/app/call_centers/call_center_queue_edit.php
index 2ee3b540b1..e911918859 100644
--- a/app/call_centers/call_center_queue_edit.php
+++ b/app/call_centers/call_center_queue_edit.php
@@ -250,11 +250,13 @@
 			$queue_timeout_data = implode($action_array);
 
 		//add the recording path if needed
-			if (file_exists($_SESSION['switch']['recordings']['dir'].'/'.$_SESSION['domain_name'].'/'.$queue_greeting)) {
-				$queue_greeting_path = $_SESSION['switch']['recordings']['dir'].'/'.$_SESSION['domain_name'].'/'.$queue_greeting;
-			}
-			else if (trim($queue_greeting) != '') {
-				$queue_greeting_path = $queue_greeting;
+			if ($queue_greeting != '') {
+				if (file_exists($_SESSION['switch']['recordings']['dir'].'/'.$_SESSION['domain_name'].'/'.$queue_greeting)) {
+					$queue_greeting_path = $_SESSION['switch']['recordings']['dir'].'/'.$_SESSION['domain_name'].'/'.$queue_greeting;
+				}
+				else {
+					$queue_greeting_path = trim($queue_greeting);
+				}
 			}
 
 		//prepare the array

From d456f95cee4650fbba467e399dcfd48cd6b4d0fa Mon Sep 17 00:00:00 2001
From: FusionPBX <markjcrane@gmail.com>
Date: Tue, 21 Apr 2020 14:43:00 -0600
Subject: [PATCH 30/30] Update callcenter.conf.lua

---
 .../resources/scripts/configuration/callcenter.conf.lua     | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/scripts/resources/scripts/app/xml_handler/resources/scripts/configuration/callcenter.conf.lua b/app/scripts/resources/scripts/app/xml_handler/resources/scripts/configuration/callcenter.conf.lua
index 3b25f0e370..269963c56b 100644
--- a/app/scripts/resources/scripts/app/xml_handler/resources/scripts/configuration/callcenter.conf.lua
+++ b/app/scripts/resources/scripts/app/xml_handler/resources/scripts/configuration/callcenter.conf.lua
@@ -179,7 +179,7 @@
 				--get and then set the complete agent_contact with the call_timeout and when necessary confirm
 						--confirm = "group_confirm_file=custom/press_1_to_accept_this_call.wav,group_confirm_key=1";
 						--if you change this variable also change app/call_center/call_center_agent_edit.php
-						confirm = "group_confirm_file=custom/press_1_to_accept_this_call.wav,group_confirm_key=1,group_confirm_read_timeout=2000,leg_timeout="..agent_call_timeout;
+						confirm = "group_confirm_file=ivr/ivr-accept_reject_voicemail.wav,group_confirm_key=1,group_confirm_read_timeout=2000,leg_timeout="..agent_call_timeout;
 						if (string.find(agent_contact, '}') == nil) then
 							--not found
 							if (string.find(agent_contact, 'sofia/gateway') == nil) then
@@ -187,10 +187,6 @@
 								agent_contact = "{call_timeout="..agent_call_timeout..",domain_name="..domain_name..",domain_uuid="..domain_uuid..",sip_h_caller_destination=${caller_destination}}"..agent_contact;
 							else
 								--add the call_timeout and confirm
-								tmp_pos = string.find(agent_contact, "}");
-								tmp_first = string.sub(agent_contact, 0, tmp_pos);
-								tmp_last = string.sub(agent_contact, tmp_pos);
-								agent_contact = tmp_first..',call_timeout='..agent_call_timeout..tmp_last;
 								agent_contact = "{"..confirm..",call_timeout="..agent_call_timeout..",domain_name="..domain_name..",domain_uuid="..domain_uuid..",sip_h_caller_destination=${caller_destination}}"..agent_contact;
 							end
 						else