From 2ef400aefd9d1f1eedfe85616354b8cd94fe31b6 Mon Sep 17 00:00:00 2001
From: "Ahron Greenberg (agree)" <37550360+greenbea@users.noreply.github.com>
Date: Tue, 11 Feb 2025 10:39:47 -0500
Subject: [PATCH 01/55] validate domain before change (#7244)

---
 core/domains/domains.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/core/domains/domains.php b/core/domains/domains.php
index 03940e5432..c059ebc34b 100644
--- a/core/domains/domains.php
+++ b/core/domains/domains.php
@@ -44,8 +44,6 @@
 
 			//update the domain session variables
 				$domain_uuid = $_GET["domain_uuid"];
-				$_SESSION["previous_domain_uuid"] = $_SESSION['domain_uuid'];
-				$_SESSION['domain_uuid'] = $domain_uuid;
 
 			//get the domain details
 				$sql = "select * from v_domains ";
@@ -58,7 +56,14 @@
 				}
 				unset($sql, $domains);
 
+			//validate the domain change
+				if (empty($_SESSION['domains'][$domain_uuid])) {
+					die("invalid domain");
+				}
+			
 			//update the domain session variables
+				$_SESSION["previous_domain_uuid"] = $_SESSION['domain_uuid'];
+				$_SESSION['domain_uuid'] = $domain_uuid;
 				$_SESSION["domain_name"] = $_SESSION['domains'][$domain_uuid]['domain_name'];
 				$_SESSION['domain']['template']['name'] = $_SESSION['domains'][$domain_uuid]['template_name'] ?? null;
 				$_SESSION["context"] = $_SESSION["domain_name"];

From 3603711d77c156e179319b1f514b40677f6f8a84 Mon Sep 17 00:00:00 2001
From: "Ahron Greenberg (agree)" <37550360+greenbea@users.noreply.github.com>
Date: Tue, 11 Feb 2025 10:41:25 -0500
Subject: [PATCH 02/55] fix destination_condition_field gets overwritten by
 default setting (#7242)

---
 app/destinations/destination_edit.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/destinations/destination_edit.php b/app/destinations/destination_edit.php
index 1508e4e240..bdcae911f5 100644
--- a/app/destinations/destination_edit.php
+++ b/app/destinations/destination_edit.php
@@ -462,7 +462,6 @@
 								}
 
 							//authorized specific dialplan_detail_type that are safe, sanitize all other values
-								$dialplan_detail_type = $settings->get('dialplan', 'destination', '');
 								switch ($dialplan_detail_type) {
 								case 'destination_number':
 									break;

From cd5ed73602a6902fc92ca9b6704f3f0525a2d3c2 Mon Sep 17 00:00:00 2001
From: FusionPBX <mark@fusionpbx.com>
Date: Tue, 11 Feb 2025 13:26:32 -0700
Subject: [PATCH 03/55] Allow # and * in the sanitized caller ID

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

diff --git a/app/xml_cdr/resources/classes/xml_cdr.php b/app/xml_cdr/resources/classes/xml_cdr.php
index 2ae2501ea6..f6f5029897 100644
--- a/app/xml_cdr/resources/classes/xml_cdr.php
+++ b/app/xml_cdr/resources/classes/xml_cdr.php
@@ -645,8 +645,8 @@ if (!class_exists('xml_cdr')) {
 						$domain_uuid = urldecode($xml->variables->domain_uuid);
 
 					//sanitize the caller ID
-						$caller_id_name = preg_replace('#[^a-zA-Z 0-9\-\.]#', '', $caller_id_name);
-						$caller_id_number = preg_replace('#[^0-9\-]#', '', $caller_id_number);
+						$caller_id_name = preg_replace('#[^a-zA-Z 0-9\-\.\#\*]#', '', $caller_id_name);
+						$caller_id_number = preg_replace('#[^0-9\-\#\*]#', '', $caller_id_number);
 
 					//misc
 						$this->array[$key][0]['ring_group_uuid'] = urldecode($xml->variables->ring_group_uuid);

From 5b1697fc17049b4ff9c30bc8c89d84542b3d2bb9 Mon Sep 17 00:00:00 2001
From: fusionate <nate@fusionpbx.com>
Date: Tue, 11 Feb 2025 18:02:16 -0700
Subject: [PATCH 04/55] Menu - Fixed: Change to submenu item links to hopefully
 resolve random submenu closure on click bug.

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

diff --git a/resources/classes/menu.php b/resources/classes/menu.php
index 5def1ec9de..80f5718fc7 100644
--- a/resources/classes/menu.php
+++ b/resources/classes/menu.php
@@ -1049,7 +1049,7 @@ if (!class_exists('menu')) {
 										$menu_sub_icon = null;
 									}
 								}
-								$html .= "						<li class='nav-item'><a class='nav-link' href='".$mod_a_2."' ".$mod_a_3.">".($this->settings->get('theme', 'menu_sub_icons', true) != false ? "<span class='fa-solid fa-minus d-inline-block d-sm-none float-left' style='margin: 4px 10px 0 25px;'></span>" : '').escape($menu_sub['menu_language_title']).$menu_sub_icon."</a></li>\n";
+								$html .= "						<li class='nav-item'><a class='nav-link' href='".$mod_a_2."' ".$mod_a_3." onclick='event.stopPropagation();'>".($this->settings->get('theme', 'menu_sub_icons', true) != false ? "<span class='fa-solid fa-minus d-inline-block d-sm-none float-left' style='margin: 4px 10px 0 25px;'></span>" : '').escape($menu_sub['menu_language_title']).$menu_sub_icon."</a></li>\n";
 								if ($columns > 1 && $column_current == 1 && ($index_sub+1) > (ceil(@sizeof($menu_parent['menu_items'])/2)-1)) {
 									$html .= "								</ul>\n";
 									$html .= "							</div>\n";

From 5c9eeb19565e53afef3b75167856cf76e1015847 Mon Sep 17 00:00:00 2001
From: frytimo <tim@fusionpbx.com>
Date: Thu, 13 Feb 2025 12:09:34 -0400
Subject: [PATCH 05/55] Remove Extra Line Ending (#7253)

---
 app/call_block/resources/dashboard/config.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/call_block/resources/dashboard/config.php b/app/call_block/resources/dashboard/config.php
index 96bd82114e..fa7d3b2657 100644
--- a/app/call_block/resources/dashboard/config.php
+++ b/app/call_block/resources/dashboard/config.php
@@ -45,4 +45,3 @@ $array['dashboard'][$x]['dashboard_groups'][$y]['group_name'] = 'user';
 $y++;
 
 ?>
-

From 0a5c377ae6b8502aa8a179da1b1996c53c2f8142 Mon Sep 17 00:00:00 2001
From: frytimo <tim@fusionpbx.com>
Date: Thu, 13 Feb 2025 12:09:52 -0400
Subject: [PATCH 06/55] Remove Extra Line Ending (#7252)

---
 app/number_translations/app_defaults.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/number_translations/app_defaults.php b/app/number_translations/app_defaults.php
index 782d0ac654..3ccd87b9fe 100644
--- a/app/number_translations/app_defaults.php
+++ b/app/number_translations/app_defaults.php
@@ -74,4 +74,3 @@
 	}
 
 ?>
-

From 0cf387f306d78beb9d9b53cbb747b251ad985d28 Mon Sep 17 00:00:00 2001
From: frytimo <tim@fusionpbx.com>
Date: Thu, 13 Feb 2025 12:10:33 -0400
Subject: [PATCH 07/55] do not save event_guard logs to transactions (#7254)

Event Guard already has a log table so no need to duplicate the transactions in another table
---
 app/event_guard/resources/service/event_guard.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/event_guard/resources/service/event_guard.php b/app/event_guard/resources/service/event_guard.php
index b916d578df..e7c8db7090 100644
--- a/app/event_guard/resources/service/event_guard.php
+++ b/app/event_guard/resources/service/event_guard.php
@@ -233,7 +233,7 @@
 					$p->add('event_guard_log_edit', 'temp');
 					$database->app_name = 'event guard';
 					$database->app_uuid = 'c5b86612-1514-40cb-8e2c-3f01a8f6f637';
-					$database->save($array);
+					$database->save($array, false);
 					//$message = $database->message;
 					$p->delete('event_guard_log_edit', 'temp');
 					unset($array);
@@ -353,7 +353,7 @@
 		$p->add('event_guard_log_add', 'temp');
 		$database->app_name = 'event guard';
 		$database->app_uuid = 'c5b86612-1514-40cb-8e2c-3f01a8f6f637';
-		$database->save($array);
+		$database->save($array, false);
 		$p->delete('event_guard_log_add', 'temp');
 
 		//send debug information to the console

From 68e3b4c1870c0ed3c18a493891e8a93931eca2df Mon Sep 17 00:00:00 2001
From: fusionate <nate@fusionpbx.com>
Date: Thu, 13 Feb 2025 11:56:07 -0700
Subject: [PATCH 08/55] Fax - New: Add cover_message, cover_message_height
 Default Settings to define a default Message and the height of the message
 box on the cover page, respectively.

---
 app/fax/app_config.php | 20 ++++++++++++++++++--
 app/fax/fax_send.php   | 22 ++++++++++++++--------
 2 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/app/fax/app_config.php b/app/fax/app_config.php
index db9727586e..75f64f9b62 100644
--- a/app/fax/app_config.php
+++ b/app/fax/app_config.php
@@ -312,7 +312,23 @@
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = "The information contained in this facsimile is intended for the sole confidential use of the recipient(s) designated above, and may contain confidential and legally privileged information. If you are not the intended recipient, you are hereby notified that the review, disclosure, dissemination, distribution, copying, duplication in any form, and taking of any action in regards to the contents of this document - except with respect to its direct delivery to the intended recipient - is strictly prohibited.  Please notify the sender immediately and destroy this cover sheet and all attachments.  If stored or viewed electronically, please permanently delete it from your system.";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Notice displayed in the footer of the cover sheet.";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Default text to populate the Footer field of a new fax (displayed below the box on the cover sheet).";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "034a7f00-9455-4354-978e-7978d193f675";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "fax";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "cover_message";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Default text to populate the Message field of a new fax (displayed inside the box on the cover sheet).";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "760eb1ec-249a-4482-bdc4-3fd35d604db9";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "fax";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "cover_message_height";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "6.15";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the default height (inches) of the Message box on the cover sheet.";
 		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "e907df99-6b3a-4864-bd11-681888f20289";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "fax";
@@ -320,7 +336,7 @@
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = "";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Default information displayed beneath the logo in the header of the cover sheet.";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Default text to populate the Header field of a new fax (displayed near the top of the cover sheet, beneath the logo).";
 		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "8338a404-3966-416e-b4f9-a1ac36c37bd1";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "fax";
diff --git a/app/fax/fax_send.php b/app/fax/fax_send.php
index fff0a9d60f..9b1fc3650d 100644
--- a/app/fax/fax_send.php
+++ b/app/fax/fax_send.php
@@ -433,7 +433,7 @@ if (!function_exists('fax_split_dtmf')) {
 				if (in_array($logo_fileext, ['gif','jpg','jpeg','png','bmp'])) {
 					if (file_exists($logo_dirname.'/'.$logo_filename)) {
 						$logo = $logo_dirname.'/'.$logo_filename;
-						$display_logo = true;	
+						$display_logo = true;
 					}
 					else {
 						$raw = file_get_contents($logo);
@@ -568,7 +568,13 @@ if (!function_exists('fax_split_dtmf')) {
 				unset($yn);
 			}
 			else {
-				$pdf->Rect($x + 0.5, $y + 3.4, 7.5, 6.25, 'D');
+				//determine cover message box height, and difference, to adjust footer position accordingly
+				$cover_message_height = $setting->get('fax','cover_message_height');
+				$cover_message_height = (float) ($cover_message_height ?? 6.15);
+				$height_difference = 6.15 - $cover_message_height;
+
+				// draw message box
+				$pdf->Rect($x + 0.5, $y + 3.4, 7.5, $cover_message_height, 'D');
 				$y = $pdf->GetY();
 			}
 
@@ -577,7 +583,7 @@ if (!function_exists('fax_split_dtmf')) {
 				$pdf->SetAutoPageBreak(true, 0.6);
 				$pdf->SetTopMargin(0.6);
 				$pdf->SetFont("helvetica", "", 8);
-				$pdf->SetXY($x + 0.5, $y + 0.6);
+				$pdf->SetXY($x + 0.5, $y + 0.6 - (float) ($height_difference ?? 0));
 				$pdf->MultiCell(7.5, 0.75, $fax_footer, 0, 'C', false);
 			}
 			$pdf->SetAutoPageBreak(false);
@@ -669,7 +675,7 @@ if (!function_exists('fax_split_dtmf')) {
 			}
 			exit;
 		}
-		
+
 		//prepare variables send the fax
 		$mail_from_address = (!empty($setting->get('fax','smtp_from'))) ? $setting->get('fax','smtp_from') : $setting->get('email','smtp_from');
 
@@ -940,7 +946,7 @@ if (!defined('STDIN')) {
 			}
 			if (is_array($contact_labels)) {
 				//sort by name(s)
-				asort($contact_labels, SORT_NATURAL); 
+				asort($contact_labels, SORT_NATURAL);
 			}
 		}
 
@@ -1015,7 +1021,7 @@ if (!defined('STDIN')) {
 		echo "</div>\n";
 		echo $text['description-2']." ".(permission_exists('fax_extension_view_domain') ? $text['description-3'] : null)."\n";
 		echo "<br /><br />\n";
-		
+
 		if ($domain_enabled == false) {
 		echo "<div class='warning_bar'>".$text['notice-sending-disabled']."</div>\n";
 		}
@@ -1160,7 +1166,7 @@ if (!defined('STDIN')) {
 			echo "		".$text['label-fax-message']."\n";
 			echo "</td>\n";
 			echo "<td class='vtable' align='left'>\n";
-			echo "	<textarea type='text' name='fax_message' class='formfld' ".$required." style='width: 65%; height: 175px;'></textarea>\n";
+			echo "	<textarea type='text' name='fax_message' class='formfld' ".$required." style='width: 65%; height: 175px;'>".$setting->get('fax','cover_message')."</textarea>\n";
 			echo "<br />\n";
 			echo "	".$text['description-fax-message']."\n";
 			echo "</td>\n";
@@ -1220,4 +1226,4 @@ function showgrid($pdf) {
 	}
 }
 */
-?>
+?>
\ No newline at end of file

From 056ddc93ca69ec0a194aac44ab75972504090099 Mon Sep 17 00:00:00 2001
From: frytimo <tim@fusionpbx.com>
Date: Thu, 13 Feb 2025 17:09:03 -0400
Subject: [PATCH 09/55] remove the automatic setting of server connection port
 in provisioning (#7243)

* remove the automatic setting of the server connection port in provisioning
---
 app/provision/resources/classes/provision.php | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/app/provision/resources/classes/provision.php b/app/provision/resources/classes/provision.php
index bd6cc5ea71..53acb6ae90 100644
--- a/app/provision/resources/classes/provision.php
+++ b/app/provision/resources/classes/provision.php
@@ -802,20 +802,11 @@
 									//set the variables
 										$line_number = $row['line_number'];
 										$register_expires = $row['register_expires'];
-										$sip_transport = strtolower($row['sip_transport']);
-										$sip_port = $row['sip_port'];
+										$sip_transport = strtolower($row['sip_transport'] ?? 'tcp');
+										$sip_port = $row['sip_port'] ?? '5060';
 
 									//set defaults
 										if (empty($register_expires)) { $register_expires = "120"; }
-										if (empty($sip_transport)) { $sip_transport = "tcp"; }
-										if (!isset($sip_port)) {
-											if ($line_number == "" || $line_number == "1") {
-												$sip_port = "5060";
-											}
-											else {
-												$sip_port = "506".($line_number + 1);
-											}
-										}
 
 									//convert seconds to minutes for grandstream
 										if ($device_vendor == 'grandstream') {

From f03803f1138d189a9ec44f89c7215982cd5583cd Mon Sep 17 00:00:00 2001
From: frytimo <tim@fusionpbx.com>
Date: Thu, 13 Feb 2025 17:12:48 -0400
Subject: [PATCH 10/55] use settings object where possible (#7246)

* use settings object where possible

* use $user_uuid instead of $_SESSION['user_uuid']

* use extension_uuid when counting for performance
---
 app/extensions/extension_edit.php | 195 ++++++++++++++++++------------
 1 file changed, 117 insertions(+), 78 deletions(-)

diff --git a/app/extensions/extension_edit.php b/app/extensions/extension_edit.php
index ae596f2bfc..0bddf373df 100644
--- a/app/extensions/extension_edit.php
+++ b/app/extensions/extension_edit.php
@@ -38,13 +38,56 @@
 		exit;
 	}
 
-//initialize the database object
-	$database = database::new();
+//get the domain and user UUIDs
+	$domain_uuid = $domain_uuid ?? '';
+	$user_uuid = $user_uuid ?? '';
 
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
 
+//initialize the core objects
+	$domain_uuid = $_SESSION['domain_uuid'] ?? '';
+	$user_uuid = $_SESSION['user_uuid'] ?? '';
+	$config = config::load();
+	$database = database::new(['config' => $config]);
+	$domain_name = $database->select('select domain_name from v_domains where domain_uuid = :domain_uuid', ['domain_uuid' => $domain_uuid], 'column');
+	$settings = new settings(['database' => $database, 'domain_uuid' => $domain_uuid, 'user_uuid' => $user_uuid]);
+
+//set defaults
+	$limit_extensions                     = $settings->get('limit', 'extensions', null);
+	$limit_devices                        = $settings->get('limit', 'devices', null);
+	$extension_limit_max                  = $settings->get('extension', 'limit_max', 5);
+	$extension_call_timeout               = $settings->get('extension', 'call_timeout', 30);
+	$extension_max_registrations          = $settings->get('extension', 'max_registrations', null);
+	$extension_password_length            = $settings->get('extension', 'password_length', 20);       //set default to 20
+	$extension_password_strength          = $settings->get('extension', 'password_strength', 4);      //set default to use numbers, Upper/Lowercase letters, special characters
+	$extension_user_record_default        = $settings->get('extension', 'user_record_default', '');
+	$provision_path                       = $settings->get('provision', 'path', '');
+	$provision_line_label                 = $settings->get('provision','line_label', null);
+	$provision_line_display_name          = $settings->get('provision','line_display_name', null);
+	$provision_outbound_proxy_primary     = $settings->get('provision','outbound_proxy_primary', null);
+	$provision_outbound_proxy_secondary   = $settings->get('provision','outbound_proxy_primary', null);
+	$provision_server_address_primary     = $settings->get('provision','outbound_proxy_primary', null);
+	$provision_server_address_secondary   = $settings->get('provision','outbound_proxy_primary', null);
+	$provision_line_sip_port              = $settings->get('provision','line_sip_port', null);
+	$provision_line_sip_transport         = $settings->get('provision','line_sip_transport', null);
+	$provision_line_register_expires      = $settings->get('provision','line_register_expires', null);
+	$theme_input_toggle_style             = $settings->get('theme','input_toggle_style', '');                       //set default to empty string
+	$voicemail_password_length            = $settings->get('voicemail', 'password_length', 6);                      //set default to 6
+	$voicemail_transcription_enabled_default = $settings->get('voicemail', 'transcription_enabled_default', false); //set default to false
+	$voicemail_enabled_default               = $settings->get('voicemail', 'enabled_default', true);
+	$switch_voicemail                        = $settings->get('switch', 'voicemail', '/var/lib/freeswitch/storage/voicemail') . "/default/$domain_name";
+	$switch_extensions                       = $settings->get('switch', 'extensions', '/etc/freeswitch/directory');
+	$switch_sounds                           = $settings->get('switch', 'sounds', '/usr/share/freeswitch/sounds');
+	$transcribe_enabled                      = $settings->get('transcribe', 'enabled', false);
+
+//cast to integers if they have values
+	if ($limit_extensions !== null) $limit_extensions = intval($limit_extensions);
+	if ($limit_devices !== null) $limit_devices = intval($limit_devices);
+	if ($extension_password_length !== null) $extension_password_length = intval($extension_password_length);
+	if ($extension_max_registrations !== null) $extension_max_registrations = intval($extension_max_registrations);
+
 //set the action as an add or an update
 	if (!empty($_REQUEST["id"]) && is_uuid($_REQUEST["id"])) {
 		$action = "update";
@@ -57,16 +100,16 @@
 
 //get total extension count from the database, check limit, if defined
 	if ($action == 'add') {
-		if (!empty($_SESSION['limit']['extensions']['numeric'])) {
-			$sql = "select count(*) ";
+		if ($limit_extensions > 0) {
+			$sql = "select count(extension_uuid) ";
 			$sql .= "from v_extensions ";
 			$sql .= "where domain_uuid = :domain_uuid ";
-			$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+			$parameters['domain_uuid'] = $domain_uuid;
 			$total_extensions = $database->select($sql, $parameters, 'column');
 			unset($sql, $parameters);
 
-			if ($total_extensions >= $_SESSION['limit']['extensions']['numeric']) {
-				message::add($text['message-maximum_extensions'].' '.$_SESSION['limit']['extensions']['numeric'], 'negative');
+			if ($total_extensions >= $limit_extensions) {
+				message::add($text['message-maximum_extensions'].' '.$limit_extensions, 'negative');
 				header('Location: extensions.php'.(isset($page) && is_numeric($page) ? '?page='.$page : null));
 				exit;
 			}
@@ -176,14 +219,14 @@
 			$user_uuid = $_POST["extension_users"][0]["user_uuid"] ?? null;
 
 		//device provisioning variables
-			if (is_array($_POST["devices"]) && @sizeof($_POST["devices"]) != 0) {
+			if (!empty($_POST["devices"])) {
 
 				//get the devices
 				$sql = "select count(device_uuid) from v_devices ";
 				$sql .= "where domain_uuid = :domain_uuid ";
 				if (!permission_exists('device_all') && !permission_exists('device_domain_all')) {
 					$sql .= "and device_user_uuid = :user_uuid ";
-					$parameters['user_uuid'] = $_SESSION['user_uuid'];
+					$parameters['user_uuid'] = $user_uuid;
 				}
 				$sql .= "order by device_address asc ";
 				$parameters['domain_uuid'] = $domain_uuid;
@@ -195,8 +238,8 @@
 						!empty($device["device_address"]) &&
 						strtolower($device["device_address"]) == 'uuid' &&
 						(
-							!isset($_SESSION['limit']['devices']['numeric']) ||
-							$total_devices < $_SESSION['limit']['devices']['numeric']
+							$limit_devices === null ||
+							$total_devices < $limit_devices
 						)) {
 						$device_address = strtolower(uuid());
 					}
@@ -229,7 +272,7 @@
 					$parameters['device_address'] = $device_address;
 					$row = $database->select($sql, $parameters, 'row');
 					if (is_array($row)) {
-						if ($_SESSION['domain_uuid'] == $row['domain_uuid']) {
+						if ($domain_uuid == $row['domain_uuid']) {
 							$device_uuid = $row['device_uuid'];
 							$device_domain_name = $row['device_domain_name'];
 							$device_unique = true;
@@ -314,7 +357,7 @@
 				$domain_uuid = $_POST["domain_uuid"];
 			}
 			else {
-				$domain_uuid = $_SESSION['domain_uuid'];
+				$domain_uuid = $domain_uuid;
 			}
 
 		//validate the token
@@ -345,10 +388,8 @@
 			}
 
 		//prevent users from bypassing extension limit by using range
-			if (!empty($_SESSION['limit']['extensions']['numeric'])) {
-				if (isset($total_extensions) && ($total_extensions ?? 0) + $range > $_SESSION['limit']['extensions']['numeric']) {
-					$range = $_SESSION['limit']['extensions']['numeric'] - $total_extensions;
-				}
+			if (isset($total_extensions) && ($total_extensions ?? 0) + $range > $limit_extensions) {
+				$range = $limit_extensions - $total_extensions;
 			}
 
 		//add or update the database
@@ -416,8 +457,8 @@
 									}
 
 								//get the password length and strength
-									$password_length = $_SESSION["extension"]["password_length"]["numeric"];
-									$password_strength = $_SESSION["extension"]["password_strength"]["numeric"];
+									$password_length = $extension_password_length;
+									$password_strength = $extension_password_strength;
 
 								//extension does not exist add it
 									if ($action == "add" || $range > 1) {
@@ -428,7 +469,7 @@
 
 								//prepare the values for mwi account
 										if (!empty($mwi_account) && strpos($mwi_account, '@') === false) {
-											$mwi_account .= "@".$_SESSION['domain_name'];
+											$mwi_account .= "@".$domain_name;
 										}
 
 								//generate a password
@@ -492,7 +533,7 @@
 									}
 									else {
 										if ($action == "add") {
-											$array["extensions"][$i]["max_registrations"] = $_SESSION['extension']['max_registrations']['numeric'];
+											$array["extensions"][$i]["max_registrations"] = $extension_max_registrations;
 										}
 									}
 									if (permission_exists("extension_limit")) {
@@ -504,7 +545,7 @@
 									}
 									else {
 										if ($action == "add") {
-											$array["extensions"][$i]["user_context"] = $_SESSION['domain_name'];
+											$array["extensions"][$i]["user_context"] = $domain_name;
 										}
 									}
 									if (permission_exists('extension_missed_call')) {
@@ -605,11 +646,11 @@
 												}
 
 												//get the dislplay label
-												if ($_SESSION['provision']['line_label']['text'] == 'auto') {
+												if ($provision_line_label == 'auto') {
 													$line_label = $extension;
 												}
 												else {
-													$line_label = $_SESSION['provision']['line_label']['text'];
+													$line_label = $provision_line_label;
 													$line_label = str_replace("\${name}", $name, $line_label);
 													$line_label = str_replace("\${effective_caller_id_name}", $effective_caller_id_name, $line_label);
 													$line_label = str_replace("\${caller_id_name}", $effective_caller_id_name, $line_label);
@@ -622,11 +663,11 @@
 												}
 
 												//get the dislplay name
-												if ($_SESSION['provision']['line_display_name']['text'] == 'auto') {
+												if ($provision_line_display_name == 'auto') {
 													$line_display_name = $name;
 												}
 												else {
-													$line_display_name = $_SESSION['provision']['line_display_name']['text'];
+													$line_display_name = $provision_line_display_name;
 													$line_display_name = str_replace("\${name}", $name, $line_display_name);
 													$line_display_name = str_replace("\${effective_caller_id_name}", $effective_caller_id_name, $line_display_name);
 													$line_display_name = str_replace("\${caller_id_name}", $effective_caller_id_name, $line_display_name);
@@ -640,14 +681,14 @@
 
 												//send a message to the user the device is not unique
 												if (!$device_unique) {
-													$message = $text['message-duplicate'].(if_group("superadmin") && $_SESSION["domain_name"] != $device_domain_name ? ": ".$device_domain_name : null);
+													$message = $text['message-duplicate'].(if_group("superadmin") && $domain_name != $device_domain_name ? ": ".$device_domain_name : null);
 													message::add($message,'negative');
 												}
 
 												//build the devices array
 												if ($device_unique && $device_address != '000000000000') {
 													$array["devices"][$j]["device_uuid"] = $device_uuids[$d];
-													$array["devices"][$j]["domain_uuid"] = $_SESSION['domain_uuid'];
+													$array["devices"][$j]["domain_uuid"] = $domain_uuid;
 													$array["devices"][$j]["device_address"] = $device_address;
 													$array["devices"][$j]["device_label"] = $extension;
 													if (!empty($device_vendor)) {
@@ -659,21 +700,21 @@
 													$array["devices"][$j]["device_enabled"] = "true";
 													$array["devices"][$j]["device_lines"][0]["device_uuid"] = $device_uuids[$d];
 													$array["devices"][$j]["device_lines"][0]["device_line_uuid"] = uuid();
-													$array["devices"][$j]["device_lines"][0]["domain_uuid"] = $_SESSION['domain_uuid'];
-													$array["devices"][$j]["device_lines"][0]["server_address"] = $_SESSION['domain_name'];
-													$array["devices"][$j]["device_lines"][0]["outbound_proxy_primary"] = $_SESSION['provision']['outbound_proxy_primary']['text'];
-													$array["devices"][$j]["device_lines"][0]["outbound_proxy_secondary"] = $_SESSION['provision']['outbound_proxy_secondary']['text'];
-													$array["devices"][$j]["device_lines"][0]["server_address_primary"] = $_SESSION['provision']['server_address_primary']['text'];
-													$array["devices"][$j]["device_lines"][0]["server_address_secondary"] = $_SESSION['provision']['server_address_secondary']['text'];
+													$array["devices"][$j]["device_lines"][0]["domain_uuid"] = $domain_uuid;
+													$array["devices"][$j]["device_lines"][0]["server_address"] = $domain_name;
+													if ($provision_outbound_proxy_primary !== null) $array["devices"][$j]["device_lines"][0]["outbound_proxy_primary"] = $provision_outbound_proxy_primary;
+													if ($provision_outbound_proxy_secondary !== null) $array["devices"][$j]["device_lines"][0]["outbound_proxy_secondary"] = $provision_outbound_proxy_secondary;
+													if ($provision_server_address_primary !== null) $array["devices"][$j]["device_lines"][0]["server_address_primary"] = $provision_server_address_primary;
+													if ($provision_server_address_secondary !== null) $array["devices"][$j]["device_lines"][0]["server_address_secondary"] = $provision_server_address_secondary;
 													$array["devices"][$j]["device_lines"][0]["label"] = $line_label;
 													$array["devices"][$j]["device_lines"][0]["display_name"] = $line_display_name;
 													$array["devices"][$j]["device_lines"][0]["user_id"] = $extension;
 													$array["devices"][$j]["device_lines"][0]["auth_id"] = $extension;
 													$array["devices"][$j]["device_lines"][0]["password"] = $password;
 													$array["devices"][$j]["device_lines"][0]["line_number"] = is_numeric($line_numbers[$d]) ? $line_numbers[$d] : '1';
-													$array["devices"][$j]["device_lines"][0]["sip_port"] = $_SESSION['provision']['line_sip_port']['text'];
-													$array["devices"][$j]["device_lines"][0]["sip_transport"] = $_SESSION['provision']['line_sip_transport']['text'];
-													$array["devices"][$j]["device_lines"][0]["register_expires"] = $_SESSION['provision']['line_register_expires']['text'];
+													if ($provision_line_sip_port !== null) $array["devices"][$j]["device_lines"][0]["sip_port"] = $provision_line_sip_port;
+													if ($provision_line_sip_transport !== null) $array["devices"][$j]["device_lines"][0]["sip_transport"] = $provision_line_sip_transport;
+													if ($provision_line_register_expires !== null) $array["devices"][$j]["device_lines"][0]["register_expires"] = $provision_line_register_expires;
 													$array["devices"][$j]["device_lines"][0]["enabled"] = "true";
 												}
 
@@ -689,7 +730,7 @@
 							if (is_dir($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/app/voicemails')) {
 								//set the voicemail password
 									if (empty($voicemail_password)) {
-										$voicemail_password = generate_password($_SESSION['voicemail']['password_length']['numeric'], 1);
+										$voicemail_password = generate_password($voicemail_password_length, 1);
 									}
 
 								//add  the voicemail to the array
@@ -711,8 +752,8 @@
 												$voicemail_uuid = uuid();
 												$voicemail_tutorial = 'true';
 												//if adding a mailbox and don't have the transcription permission, set the default transcribe behavior
-												if (!permission_exists('voicemail_transcription_enabled') && isset($_SESSION['voicemail']['transcription_enabled_default']['boolean'])) {
-													$voicemail_transcription_enabled = $_SESSION['voicemail']['transcription_enabled_default']['boolean'];
+												if (!permission_exists('voicemail_transcription_enabled')) {
+													$voicemail_transcription_enabled = $voicemail_transcription_enabled_default;
 												}
 											}
 
@@ -738,8 +779,8 @@
 											$array["voicemails"][$i]["voicemail_description"] = $description;
 
 										//make sure the voicemail directory exists
-											if (!file_exists($_SESSION['switch']['voicemail']['dir']."/default/".$_SESSION['domain_name']."/".$voicemail_id)) {
-												mkdir($_SESSION['switch']['voicemail']['dir']."/default/".$_SESSION['domain_name']."/".$voicemail_id, 0770, true);
+											if (!file_exists($switch_voicemail.'/'.$voicemail_id)) {
+												mkdir($switch_voicemail."/".$voicemail_id, 0770, true);
 											}
 
 									}
@@ -772,8 +813,8 @@
 						$sql .= "and server_address = :server_address ";
 						$sql .= "and user_id = :user_id ";
 						$parameters['password'] = $password;
-						$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
-						$parameters['server_address'] = $_SESSION['domain_name'];
+						$parameters['domain_uuid'] = $domain_uuid;
+						$parameters['server_address'] = $domain_name;
 						$parameters['user_id'] = $extension;
 						$database->execute($sql, $parameters);
 						unset($sql, $parameters);
@@ -786,7 +827,7 @@
 						$sql .= "where domain_uuid = :domain_uuid ";
 						$sql .= "and device_key_value = :device_key_value ";
 						$parameters['device_key_label'] = $effective_caller_id_name;
-						$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+						$parameters['domain_uuid'] = $domain_uuid;
 						$parameters['device_key_value'] = $extension;
 						$database->execute($sql, $parameters);
 						unset($sql, $parameters);
@@ -808,7 +849,7 @@
 					if (permission_exists('extension_add') || permission_exists('extension_edit')) {
 
 						//synchronize configuration
-							if (!empty($_SESSION['switch']['extensions']['dir']) && is_writable($_SESSION['switch']['extensions']['dir'])) {
+							if (is_writable($switch_extensions)) {
 								require_once "app/extensions/resources/classes/extension.php";
 								$ext = new extension;
 								$ext->xml();
@@ -816,12 +857,10 @@
 							}
 
 						//write the provision files
-							if (!empty($_SESSION['provision']['path']['text'])) {
-								if (is_dir($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/app/provision')) {
-									$prov = new provision;
-									$prov->domain_uuid = $domain_uuid;
-									$response = $prov->write();
-								}
+							if (!empty($provision_path) && is_dir($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/app/provision')) {
+								$prov = new provision;
+								$prov->domain_uuid = $domain_uuid;
+								$response = $prov->write();
 							}
 
 						//clear the cache
@@ -942,8 +981,8 @@
 
 	}
 	else {
-		$voicemail_file = $_SESSION['voicemail']['voicemail_file']['text'];
-		$voicemail_local_after_email = $_SESSION['voicemail']['keep_local']['boolean'];
+		$voicemail_file = $settings->get('voicemail', 'voicemail_file', 'attach');
+		$voicemail_local_after_email = $settings->get('voicemail','keep_local', true);
 	}
 
 //get the device lines
@@ -966,7 +1005,7 @@
 	$sql .= "where domain_uuid = :domain_uuid ";
 	if (!permission_exists('device_all') && !permission_exists('device_domain_all')) {
 		$sql .= "and device_user_uuid = :user_uuid ";
-		$parameters['user_uuid'] = $_SESSION['user_uuid'];
+		$parameters['user_uuid'] = $user_uuid;
 	}
 	$sql .= "order by device_address asc ";
 	$parameters['domain_uuid'] = $domain_uuid;
@@ -1044,30 +1083,30 @@
 	$toll_allow = str_replace(':',',', $toll_allow ?? '');
 
 //get installed languages
-	$language_paths = glob($_SESSION["switch"]['sounds']['dir']."/*/*/*");
+	$language_paths = glob($switch_sounds."/*/*/*");
 	foreach ($language_paths as $key => $path) {
-		$path = str_replace($_SESSION["switch"]['sounds']['dir'].'/', "", $path);
+		$path = str_replace($switch_sounds.'/', "", $path);
 		$path_array = explode('/', $path);
 		if (count($path_array) <> 3 || strlen($path_array[0]) <> 2 || strlen($path_array[1]) <> 2) {
 			unset($language_paths[$key]);
 		}
-		$language_paths[$key] = str_replace($_SESSION["switch"]['sounds']['dir']."/","",$language_paths[$key] ?? '');
+		$language_paths[$key] = str_replace($switch_sounds."/","",$language_paths[$key] ?? '');
 		if (empty($language_paths[$key])) {
 			unset($language_paths[$key]);
 		}
 	}
 
 //set the defaults
-	if (empty($user_context)) { $user_context = $_SESSION['domain_name']; }
-	if (empty($max_registrations)) { $max_registrations = $_SESSION['extension']['max_registrations']['numeric'] ?? ''; }
+	if (empty($user_context)) { $user_context = $domain_name; }
+	if (empty($max_registrations)) { $max_registrations = $extension_max_registrations ?? ''; }
 	if (empty($accountcode)) { $accountcode = get_accountcode(); }
-	if (empty($limit_max)) { $limit_max = $_SESSION['extension']['limit_max']['numeric'] ?? 5; }
+	if (empty($limit_max)) { $limit_max = $extension_limit_max; }
 	if (empty($limit_destination)) { $limit_destination = '!USER_BUSY'; }
-	if (empty($call_timeout)) { $call_timeout = $_SESSION['extension']['call_timeout']['numeric'] ?? 30; }
+	if (empty($call_timeout)) { $call_timeout = $extension_call_timeout; }
 	if (empty($call_screen_enabled)) { $call_screen_enabled = 'false'; }
-	if (empty($user_record)) { $user_record = $_SESSION['extension']['user_record_default']['text']; }
-	if (empty($voicemail_transcription_enabled)) { $voicemail_transcription_enabled = $_SESSION['voicemail']['transcription_enabled_default']['boolean']; }
-	if (empty($voicemail_enabled)) { $voicemail_enabled = $_SESSION['voicemail']['enabled_default']['boolean']; }
+	if (empty($user_record)) { $user_record = $extension_user_record_default; }
+	if (empty($voicemail_transcription_enabled)) { $voicemail_transcription_enabled = $voicemail_transcription_enabled_default; }
+	if (empty($voicemail_enabled)) { $voicemail_enabled = $voicemail_enabled_default; }
 	if (empty($enabled)) { $enabled = 'true'; }
 
 //create token
@@ -1132,7 +1171,7 @@
 	}
 	echo 	"</div>\n";
 	echo "	<div class='actions'>\n";
-	echo button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>$_SESSION['theme']['button_icon_back'],'id'=>'btn_back','link'=>'extensions.php'.(isset($page) && is_numeric($page) ? '?page='.$page : null)]);
+	echo button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>$settings->get('theme', 'button_icon_back'),'id'=>'btn_back','link'=>'extensions.php'.(isset($page) && is_numeric($page) ? '?page='.$page : null)]);
 	if ($action == 'update') {
 		$button_margin = 'margin-left: 15px;';
 		if (permission_exists('xml_cdr_view')) {
@@ -1144,14 +1183,14 @@
 			unset($button_margin);
 		}
 		if (permission_exists('extension_setting_view')) {
-			echo button::create(['type'=>'button','label'=>$text['button-settings'],'icon'=>$_SESSION['theme']['button_icon_settings'],'id'=>'btn_settings','style'=>'','link'=>PROJECT_PATH.'/app/extension_settings/extension_settings.php?id='.urlencode($extension_uuid)]);
+			echo button::create(['type'=>'button','label'=>$text['button-settings'],'icon'=>$settings->get('theme', 'button_icon_settings'),'id'=>'btn_settings','style'=>'','link'=>PROJECT_PATH.'/app/extension_settings/extension_settings.php?id='.urlencode($extension_uuid)]);
 		}
 		if (permission_exists('extension_copy')) {
-			echo button::create(['type'=>'button','label'=>$text['button-copy'],'icon'=>$_SESSION['theme']['button_icon_copy'],'id'=>'btn_copy','style'=>'margin-left: 15px;','onclick'=>"copy_extension();"]);
+			echo button::create(['type'=>'button','label'=>$text['button-copy'],'icon'=>$settings->get('theme', 'button_icon_copy'),'id'=>'btn_copy','style'=>'margin-left: 15px;','onclick'=>"copy_extension();"]);
 		}
 
 	}
-	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 button::create(['type'=>'button','label'=>$text['button-save'],'icon'=>$settings->get('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";
@@ -1165,7 +1204,7 @@
 	echo "</td>\n";
 	echo "<td width='70%' class='vtable' align='left'>\n";
 	if ($action == "add" || permission_exists("extension_extension")) {
-		echo "    <input class='formfld' type='text' name='extension' autocomplete='new-password' maxlength='255' value=\"".escape($extension ?? '')."\" required='required' placeholder=\"".($_SESSION['extension']['extension_range']['text'] ?? '')."\">\n";
+		echo "    <input class='formfld' type='text' name='extension' autocomplete='new-password' maxlength='255' value=\"".escape($extension ?? '')."\" required='required' placeholder=\"".$settings->get('extension','extension_range','')."\">\n";
 		echo "    <input type='text' style='display: none;' disabled='disabled'>\n"; //help defeat browser auto-fill
 		echo "<br />\n";
 		echo $text['description-extension']."\n";
@@ -1270,7 +1309,7 @@
 			}
 			echo "			</select>";
 			if ($action == "update") {
-				echo button::create(['type'=>'submit','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add']]);
+				echo button::create(['type'=>'submit','label'=>$text['button-add'],'icon'=>$settings->get('theme', 'button_icon_add')]);
 			}
 			echo "			<br>\n";
 		}
@@ -1404,7 +1443,7 @@
 						}
 					}
 				}
-				if (permission_exists('device_address_uuid') && (!isset($_SESSION['limit']['devices']['numeric']) || $total_devices < $_SESSION['limit']['devices']['numeric'])) {
+				if (permission_exists('device_address_uuid') && ($limit_devices === null || $total_devices < $limit_devices)) {
 					echo "							<option disabled='disabled'></option>\n";
 					echo "							<option value='UUID'>".$text['label-generate']."</option>\n";
 				}
@@ -1439,7 +1478,7 @@
 				echo "		</td>\n";
 				if (is_array($device_lines) && @sizeof($device_lines) != 0) {
 					echo "		<td>\n";
-					echo button::create(['type'=>'submit','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add']]);
+					echo button::create(['type'=>'submit','label'=>$text['button-add'],'icon'=>$settings->get('theme', 'button_icon_add')]);
 					echo "		</td>\n";
 				}
 				echo "	</tr>\n";
@@ -1788,7 +1827,7 @@
 		echo "</td>\n";
 		echo "</tr>\n";
 
-		if (permission_exists('voicemail_transcription_enabled') && ($_SESSION['transcribe']['enabled']['boolean'] ?? '') == "true") {
+		if (permission_exists('voicemail_transcription_enabled') && $transcribe_enabled) {
 			echo "<tr>\n";
 			echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
 			echo "	".$text['label-voicemail_transcription_enabled']."\n";
@@ -1904,10 +1943,10 @@
 		echo "	".$text['label-call_group']."\n";
 		echo "</td>\n";
 		echo "<td class='vtable' align='left'>\n";
-		if (!empty($_SESSION['call_group']['name']) && is_array($_SESSION['call_group']['name'])) {
+		if (!empty($settings->get('call_group', 'name')) && is_array($settings->get('call_group', 'name'))) {
 			echo "	<select class='formfld' name='call_group'>\n";
 			echo "		<option value=''></option>\n";
-			foreach ($_SESSION['call_group']['name'] as $name) {
+			foreach ($settings->get('call_group', 'name') as $name) {
 				if ($name == $call_group) {
 					echo "		<option value='".escape($name)."' selected='selected'>".escape($name)."</option>\n";
 				}
@@ -2271,7 +2310,7 @@
 		echo "    ".$text['label-enabled']."\n";
 		echo "</td>\n";
 		echo "<td class='vtable' align='left'>\n";
-		if (substr($_SESSION['theme']['input_toggle_style']['text'], 0, 6) == 'switch') {
+		if (substr($settings->get('theme', 'input_toggle_style'), 0, 6) == 'switch') {
 			echo "	<label class='switch'>\n";
 			echo "		<input type='checkbox' id='enabled' name='enabled' value='true' ".($enabled == 'true' ? "checked='checked'" : null).">\n";
 			echo "		<span class='slider'></span>\n";
@@ -2311,7 +2350,7 @@
 		echo "<input type='hidden' name='extension_uuid' value='".escape($extension_uuid)."'>\n";
 		echo "<input type='hidden' name='id' id='id' value='".escape($extension_uuid)."'>";
 		if (!permission_exists('extension_domain')) {
-			echo "<input type='hidden' name='domain_uuid' id='domain_uuid' value='".$_SESSION['domain_uuid']."'>";
+			echo "<input type='hidden' name='domain_uuid' id='domain_uuid' value='".$domain_uuid."'>";
 		}
 		echo "<input type='hidden' name='delete_type' id='delete_type' value=''>";
 		echo "<input type='hidden' name='delete_uuid' id='delete_uuid' value=''>";

From 9b0eead911045aa7abab3cd4fd695d3795afacb1 Mon Sep 17 00:00:00 2001
From: frytimo <tim@fusionpbx.com>
Date: Thu, 13 Feb 2025 17:18:36 -0400
Subject: [PATCH 11/55] Fix incorrect name on disk usage chart (#7237)

* fix incorrect name on disk usage chart

* put correct information in disk usage for Linux and FreeBSD systems

* Update system_disk_usage.php

* Update system_disk_usage.php
---
 .../resources/dashboard/system_disk_usage.php | 167 +++++-------------
 1 file changed, 47 insertions(+), 120 deletions(-)

diff --git a/app/system/resources/dashboard/system_disk_usage.php b/app/system/resources/dashboard/system_disk_usage.php
index 02135183ea..ada15830fd 100644
--- a/app/system/resources/dashboard/system_disk_usage.php
+++ b/app/system/resources/dashboard/system_disk_usage.php
@@ -21,8 +21,8 @@
 	echo "<div class='hud_box'>\n";
 
 	$c = 0;
-	$row_style["0"] = "row_style0";
-	$row_style["1"] = "row_style1";
+	$row_style['0'] = "row_style0";
+	$row_style['1'] = "row_style1";
 
 	//disk usage
 	if (PHP_OS == 'FreeBSD' || PHP_OS == 'Linux') {
@@ -37,16 +37,16 @@
 		if (!empty($percent_disk_usage)) {
 
 			//add half doughnut chart
-			echo "	<div class='hud_content' ".($dashboard_details_state == "disabled" ?: "onclick=\"$('#hud_system_status_details').slideToggle('fast'); toggle_grid_row_end('".$dashboard_name."')\"").">\n";
+			echo "	<div class='hud_content' ".($dashboard_details_state == "disabled" ?: "onclick=\"$('#hud_system_disk_usage_details').slideToggle('fast'); toggle_grid_row_end('".$dashboard_name."')\"").">\n";
 			echo "		<span class='hud_title'><a onclick=\"document.location.href='".PROJECT_PATH."/app/system/system.php'\">".$text['label-disk_usage']."</a></span>\n";
 
 			if (!isset($dashboard_chart_type) || $dashboard_chart_type == "doughnut") {
 				?>
-				<div class='hud_chart' style='width: 175px;'><canvas id='system_status_chart'></canvas></div>
+				<div class='hud_chart' style='width: 175px;'><canvas id='system_disk_usage_chart'></canvas></div>
 
 				<script>
-					const system_status_chart = new Chart(
-						document.getElementById('system_status_chart').getContext('2d'),
+					const system_disk_usage_chart = new Chart(
+						document.getElementById('system_disk_usage_chart').getContext('2d'),
 						{
 							type: 'doughnut',
 							data: {
@@ -102,133 +102,60 @@
 	}
 
 	if ($dashboard_details_state != 'disabled') {
-		echo "<div class='hud_details hud_box' id='hud_system_status_details'>";
+		echo "<div class='hud_details hud_box' id='hud_system_disk_usage_details'>";
 		echo "<table class='tr_hover' width='100%' cellpadding='0' cellspacing='0' border='0'>\n";
 		echo "<tr>\n";
-		echo "<th class='hud_heading' width='50%'>".$text['label-item']."</th>\n";
-		echo "<th class='hud_heading' style='text-align: right;'>".$text['label-value']."</th>\n";
+		echo "  <th class='hud_heading' width='50%'>".($text['label-mount_point'] ?? 'Mount Point')."</th>\n";
+		echo "  <th class='hud_heading' style='text-align: center;'>".($text['label-size'] ?? 'Size')."</th>\n";
+		echo "  <th class='hud_heading' style='text-align: center;'>".($text['label-used'] ?? 'Used')."</th>\n";
+		echo "  <th class='hud_heading' style='text-align: right;'>".($text['label-available'] ?? 'Available')."</th>\n";
 		echo "</tr>\n";
 
-		//pbx version
-			echo "<tr class='tr_link_void'>\n";
-			echo "<td valign='top' class='".$row_style[$c]." hud_text'>".(isset($_SESSION['theme']['title']['text'])?$_SESSION['theme']['title']['text']:'FusionPBX')."</td>\n";
-			echo "<td valign='top' class='".$row_style[$c]." hud_text' style='text-align: right;'>".software::version()."</td>\n";
-			echo "</tr>\n";
-			$c = ($c) ? 0 : 1;
-
-		//os uptime
-			if (stristr(PHP_OS, 'Linux')) {
-				$prefix = 'up ';
-				$linux_uptime = shell_exec('uptime  -p');
-				$uptime = substr($linux_uptime, strlen($prefix));
-				if (!empty($uptime)) {
-					echo "<tr class='tr_link_void'>\n";
-					echo "<td valign='top' class='".$row_style[$c]." hud_text'>".$text['label-system_uptime']."</td>\n";
-					echo "<td valign='top' class='".$row_style[$c]." hud_text' style='text-align: right;'>".$uptime."</td>\n";
-					echo "</tr>\n";
-					$c = ($c) ? 0 : 1;
-				}
-			}
-
-		//memory usage (for available memory, use "free | awk 'FNR == 3 {print $4/($3+$4)*100}'" instead)
-			if (stristr(PHP_OS, 'Linux')) {
-				$free = shell_exec("/usr/bin/which free");
-				$awk = shell_exec("/usr/bin/which awk");
-				$percent_memory = round((float)shell_exec(escapeshellcmd($free." | ".$awk." 'FNR == 3 {print $3/($3+$4)*100}'")), 1);
-				if (!empty($percent_memory)) {
-					echo "<tr class='tr_link_void'>\n";
-					echo "<td valign='top' class='".$row_style[$c]." hud_text'>".$text['label-memory_usage']."</td>\n";
-					echo "<td valign='top' class='".$row_style[$c]." hud_text' style='text-align: right;'>".$percent_memory."%</td>\n";
-					echo "</tr>\n";
-					$c = ($c) ? 0 : 1;
-				}
-			}
-
-		//memory available
-			if (stristr(PHP_OS, 'Linux')) {
-				$result = trim(shell_exec('free -hw | grep \'Mem:\' | cut -d\' \' -f 55-64'));
-				if (!empty($result)) {
-					echo "<tr class='tr_link_void'>\n";
-					echo "<td valign='top' class='".$row_style[$c]." hud_text'>".$text['label-memory_available']."</td>\n";
-					echo "<td valign='top' class='".$row_style[$c]." hud_text' style='text-align: right;'>".$result."</td>\n";
-					echo "</tr>\n";
-					$c = ($c) ? 0 : 1;
-				}
-			}
-
 		//disk usage
-			if (stristr(PHP_OS, 'Linux')) {
-				//calculated above
-				if (!empty($percent_disk_usage)) {
-					echo "<tr class='tr_link_void'>\n";
-					echo "<td valign='top' class='".$row_style[$c]." hud_text'>".$text['label-disk_usage']."</td>\n";
-					echo "<td valign='top' class='".$row_style[$c]." hud_text' style='text-align: right;'>".$percent_disk_usage."%</td>\n";
-					echo "</tr>\n";
-					$c = ($c) ? 0 : 1;
-				}
-			}
-
-		//db connections
-			switch ($db_type) {
-				case 'pgsql':
-					$sql = "select count(*) from pg_stat_activity";
-					break;
-				case 'mysql':
-					$sql = "show status where `variable_name` = 'Threads_connected'";
-					break;
-				default:
-					unset($sql);
-					if (!empty($db_path) && !empty($dbfilename)) {
-						$tmp =  shell_exec("lsof ".realpath($db_path).'/'.$dbfilename);
-						$tmp = explode("\n", $tmp);
-						$connections = sizeof($tmp) - 1;
+			if (permission_exists('system_view_hdd')) {
+				$system_information = [];
+				if (stristr(PHP_OS, 'Linux') || stristr(PHP_OS, 'FreeBSD')) {
+					$shell_result = shell_exec('df -hP');
+					if (!empty($shell_result)) {
+						$lines = explode("\n",$shell_result);
+						//name the columns
+						$column_names = preg_split("/[\s,]+/", $lines[0]);
+						$col_file_system = array_search('Filesystem', $column_names, true); //usually 0
+						$col_size = array_search('Size', $column_names, true);              //usually 1
+						$col_used = array_search('Used', $column_names, true);              //usually 2
+						$col_available = array_search('Avail', $column_names, true);        //usually 3
+						$col_mount_point = array_search('Mounted', $column_names, true);    //usually 5 but can be 4
+						//skip heading line by starting at 1
+						for ($i = 1; $i < count($lines); $i++) {
+							$line = $lines[$i];
+							$columns = preg_split("/[\s,]+/", $line);
+							$system_information['os']['disk'][$i-1]['file_system'] = $columns[$col_file_system];
+							$system_information['os']['disk'][$i-1][   'size'    ] = $columns[   $col_size    ];
+							$system_information['os']['disk'][$i-1][   'used'    ] = $columns[   $col_used    ];
+							$system_information['os']['disk'][$i-1][ 'available' ] = $columns[ $col_available ];
+							$system_information['os']['disk'][$i-1]['mount_point'] = $columns[$col_mount_point];
+						}
 					}
-			}
-			if (!empty($sql)) {
-				if (!isset($database)) { $database = new database; }
-				$connections = $database->select($sql, null, 'column');
-				unset($sql);
-			}
-			if (!empty($connections)) {
-				echo "<tr class='tr_link_void'>\n";
-				echo "<td valign='top' class='".$row_style[$c]." hud_text'>".$text['label-database_connections']."</td>\n";
-				echo "<td valign='top' class='".$row_style[$c]." hud_text' style='text-align: right;'>".$connections."</td>\n";
-				echo "</tr>\n";
-				$c = ($c) ? 0 : 1;
-			}
+					foreach ($system_information['os']['disk'] as $disk) {
+						echo "<tr class='tr_link_void'>\n";
+						echo "  <td valign='top' class='".$row_style[$c]." hud_text' style='text-align: left;'>".$disk['mount_point']."</td>\n";
+						echo "  <td valign='top' class='".$row_style[$c]." hud_text' style='text-align: center;'>".$disk[   'size'    ]."</td>\n";
+						echo "  <td valign='top' class='".$row_style[$c]." hud_text' style='text-align: center;'>".$disk[   'used'    ]."</td>\n";
+						echo "  <td valign='top' class='".$row_style[$c]." hud_text' style='text-align: right;'>".$disk[ 'available' ]."</td>\n";
+						echo "</tr>\n";
+						$c = ($c) ? 0 : 1;
+					}
+				}
+				else if (stristr(PHP_OS, 'WIN')) {
 
-		//channel count
-			$esl = event_socket::create();
-			if ($esl->is_connected()) {
-				$tmp = event_socket::api('status');
-				$matches = Array();
-				preg_match("/(\d+)\s+session\(s\)\s+\-\speak/", $tmp, $matches);
-				$channels = !empty($matches[1]) ? $matches[1] : 0;
-				$tr_link = "href='".PROJECT_PATH."/app/calls_active/calls_active.php'";
-				echo "<tr ".$tr_link.">\n";
-				echo "<td valign='top' class='".$row_style[$c]." hud_text'><a ".$tr_link.">".$text['label-channels']."</a></td>\n";
-				echo "<td valign='top' class='".$row_style[$c]." hud_text' style='text-align: right;'>".$channels."</td>\n";
-				echo "</tr>\n";
-				$c = ($c) ? 0 : 1;
-			}
-
-		//registration count
-			if ($esl->is_connected() && file_exists($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/app/registrations/")) {
-				$registration = new registrations;
-				$registrations = $registration->count();
-				$tr_link = "href='".PROJECT_PATH."/app/registrations/registrations.php'";
-				echo "<tr ".$tr_link.">\n";
-				echo "<td valign='top' class='".$row_style[$c]." hud_text'><a ".$tr_link.">".$text['label-registrations']."</a></td>\n";
-				echo "<td valign='top' class='".$row_style[$c]." hud_text' style='text-align: right;'>".$registrations."</td>\n";
-				echo "</tr>\n";
-				$c = ($c) ? 0 : 1;
+				}
 			}
 
 		echo "</table>\n";
 		echo "</div>";
 		//$n++;
 
-		echo "<span class='hud_expander' onclick=\"$('#hud_system_status_details').slideToggle('fast'); toggle_grid_row_end('".$dashboard_name."')\"><span class='fas fa-ellipsis-h'></span></span>";
+		echo "<span class='hud_expander' onclick=\"$('#hud_system_disk_usage_details').slideToggle('fast'); toggle_grid_row_end('".$dashboard_name."')\"><span class='fas fa-ellipsis-h'></span></span>";
 	}
 	echo "</div>\n";
 

From 0931197137fe0355ad7c8b3d519c4e679ad25bb1 Mon Sep 17 00:00:00 2001
From: frytimo <tim@fusionpbx.com>
Date: Thu, 13 Feb 2025 17:48:40 -0400
Subject: [PATCH 12/55] build array in auto_loader constructor (#7158)

* Build an array in the auto_loader constructor

* Update auto_loader.php

* Update auto_loader.php

* minor adjustment to name and comment and remove trailing closing tag

* use best practices for the loader method
Allowing the loader method:
- Should Never Be Called Manually
- Prevents External Modification
- Hides Implementation Details

* cache array in the temp folder and load if available

* re-organize functions within the class

* add cache recreation for auto_loader in upgrade_menu

* add cache recreation for auto_loader in upgrade_menu

* Update app_languages.php
---
 core/upgrade/app_languages.php    | 108 ++++++++++++++++++++++++-
 core/upgrade/upgrade_menu.php     |  99 +++++++++++++++++------
 resources/classes/auto_loader.php | 127 ++++++++++++++++++++----------
 3 files changed, 265 insertions(+), 69 deletions(-)

diff --git a/core/upgrade/app_languages.php b/core/upgrade/app_languages.php
index 74b3d9c625..cc45a5e5ff 100644
--- a/core/upgrade/app_languages.php
+++ b/core/upgrade/app_languages.php
@@ -1701,4 +1701,110 @@ $text['button-preview']['zh-cn'] = "预览";
 $text['button-preview']['ja-jp'] = "プレビュー";
 $text['button-preview']['ko-kr'] = "시사";
 
-?>
+$text['label-update_auto_loader']['en-us'] = 'Update Auto Loader Cache';
+$text['label-update_auto_loader']['en-gb'] = 'Update Auto Loader Cache';
+$text['label-update_auto_loader']['ar-eg'] = 'تحديث ذاكرة التخزين المؤقتة للتحميل التلقائي';
+$text['label-update_auto_loader']['de-at'] = 'AutoLoader-Cache aktualisieren';
+$text['label-update_auto_loader']['de-ch'] = 'AutoLoader-Cache aktualisieren';
+$text['label-update_auto_loader']['de-de'] = 'AutoLoader-Cache aktualisieren';
+$text['label-update_auto_loader']['el-gr'] = 'Ενημερώστε την προσωρινή μνήμη Auto Loader';
+$text['label-update_auto_loader']['es-cl'] = 'Actualizar la caché del cargador automático';
+$text['label-update_auto_loader']['es-mx'] = 'Actualizar la caché del cargador automático';
+$text['label-update_auto_loader']['fr-ca'] = 'Mettre à jour le cache du chargeur automatique';
+$text['label-update_auto_loader']['fr-fr'] = 'Mettre à jour le cache du chargeur automatique';
+$text['label-update_auto_loader']['he-il'] = 'עדכן את מטמון הטעינה האוטומטית';
+$text['label-update_auto_loader']['it-it'] = 'Aggiorna la cache del caricatore automatico';
+$text['label-update_auto_loader']['ka-ge'] = 'Auto Loader Cache-ის განახლება';
+$text['label-update_auto_loader']['nl-nl'] = 'Auto Loader-cache bijwerken';
+$text['label-update_auto_loader']['pl-pl'] = 'Aktualizuj pamięć podręczną Auto Loader';
+$text['label-update_auto_loader']['pt-br'] = 'Atualizar cache do carregador automático';
+$text['label-update_auto_loader']['pt-pt'] = 'Atualizar cache do carregador automático';
+$text['label-update_auto_loader']['ro-ro'] = 'Actualizați memoria cache a încărcării automate';
+$text['label-update_auto_loader']['ru-ru'] = 'Обновить кэш автозагрузчика';
+$text['label-update_auto_loader']['sv-se'] = 'Uppdatera Auto Loader Cache';
+$text['label-update_auto_loader']['uk-ua'] = 'Оновити кеш автозавантажувача';
+$text['label-update_auto_loader']['tr-tr'] = 'Otomatik Yükleyici Önbelleğini Güncelle';
+$text['label-update_auto_loader']['zh-cn'] = '更新自动加载器缓存';
+$text['label-update_auto_loader']['ja-jp'] = 'オートローダーキャッシュの更新';
+$text['label-update_auto_loader']['ko-kr'] = '자동 로더 캐시 업데이트';
+
+$text['description-update_auto_loader']['en-us'] = 'Updates the auto_loader cache file to include any new classes added to the project';
+$text['description-update_auto_loader']['en-gb'] = 'Updates the auto_loader cache file to include any new classes added to the project';
+$text['description-update_auto_loader']['ar-eg'] = 'يقوم بتحديث ملف ذاكرة التخزين المؤقت لـ auto_loader ليشمل أي فئات جديدة تمت إضافتها إلى المشروع';
+$text['description-update_auto_loader']['de-at'] = 'Aktualisiert die Auto_Loader-Cachedatei, um alle neuen Klassen einzuschließen, die dem Projekt hinzugefügt werden';
+$text['description-update_auto_loader']['de-ch'] = 'Aktualisiert die Auto_Loader-Cachedatei, um alle neuen Klassen einzuschließen, die dem Projekt hinzugefügt werden';
+$text['description-update_auto_loader']['de-de'] = 'Aktualisiert die Auto_Loader-Cachedatei, um alle neuen Klassen einzuschließen, die dem Projekt hinzugefügt werden';
+$text['description-update_auto_loader']['el-gr'] = 'Ενημερώνει το αρχείο προσωρινής μνήμης auto_loader για να συμπεριλάβει τυχόν νέες κλάσεις που προστέθηκαν στο έργο';
+$text['description-update_auto_loader']['es-cl'] = 'Actualiza el archivo de caché auto_loader para incluir cualquier clase nueva agregada al proyecto';
+$text['description-update_auto_loader']['es-mx'] = 'Actualiza el archivo de caché auto_loader para incluir cualquier clase nueva agregada al proyecto';
+$text['description-update_auto_loader']['fr-ca'] = 'Met à jour le fichier cache du chargeur automatique pour inclure toutes les nouvelles classes ajoutées au projet';
+$text['description-update_auto_loader']['fr-fr'] = 'Met à jour le fichier cache du chargeur automatique pour inclure toutes les nouvelles classes ajoutées au projet';
+$text['description-update_auto_loader']['he-il'] = 'מעדכן את קובץ המטמון auto_loader כך שיכלול כל מחלקות חדשות שנוספו לפרויקט';
+$text['description-update_auto_loader']['it-it'] = 'Aggiorna il file di cache auto_loader per includere tutte le nuove classi aggiunte al progetto';
+$text['description-update_auto_loader']['ka-ge'] = 'აახლებს auto_loader ქეში ფაილს, რათა შეიცავდეს პროექტში დამატებულ ნებისმიერ ახალ კლასს';
+$text['description-update_auto_loader']['nl-nl'] = 'Werkt het auto_loader-cachebestand bij om alle nieuwe klassen op te nemen die aan het project zijn toegevoegd';
+$text['description-update_auto_loader']['pl-pl'] = 'Aktualizuje plik pamięci podręcznej auto_loader, aby uwzględnić wszystkie nowe klasy dodane do projektu';
+$text['description-update_auto_loader']['pt-br'] = 'Atualiza o arquivo de cache do auto_loader para incluir quaisquer novas classes adicionadas ao projeto';
+$text['description-update_auto_loader']['pt-pt'] = 'Atualiza o arquivo de cache do auto_loader para incluir quaisquer novas classes adicionadas ao projeto';
+$text['description-update_auto_loader']['ro-ro'] = 'Actualizează fișierul cache auto_loader pentru a include orice clase noi adăugate la proiect';
+$text['description-update_auto_loader']['ru-ru'] = 'Обновляет файл кэша auto_loader, включая в него все новые классы, добавленные в проект.';
+$text['description-update_auto_loader']['sv-se'] = 'Uppdaterar cachefilen för auto_loader för att inkludera alla nya klasser som lagts till i projektet';
+$text['description-update_auto_loader']['uk-ua'] = 'Оновлює файл кешу auto_loader, щоб включити всі нові класи, додані до проекту';
+$text['description-update_auto_loader']['tr-tr'] = 'Projeye eklenen tüm yeni sınıfları içerecek şekilde auto_loader önbellek dosyasını günceller';
+$text['description-update_auto_loader']['zh-cn'] = '更新 auto_loader 缓存文件以包含添加到项目中的任何新类';
+$text['description-update_auto_loader']['ja-jp'] = 'プロジェクトに追加された新しいクラスを含めるために auto_loader キャッシュ ファイルを更新します。';
+$text['description-update_auto_loader']['ko-kr'] = '프로젝트에 추가된 모든 새 클래스를 포함하도록 auto_loader 캐시 파일을 업데이트합니다.';
+
+$text['label-reloaded_classes']['en-us'] = 'Reloaded classes';
+$text['label-reloaded_classes']['en-gb'] = 'Reloaded classes';
+$text['label-reloaded_classes']['ar-eg'] = 'الفصول المعاد تحميلها';
+$text['label-reloaded_classes']['de-at'] = 'Neu geladene Klassen';
+$text['label-reloaded_classes']['de-ch'] = 'Neu geladene Klassen';
+$text['label-reloaded_classes']['de-de'] = 'Neu geladene Klassen';
+$text['label-reloaded_classes']['el-gr'] = 'Επαναφόρτωση τάξεων';
+$text['label-reloaded_classes']['es-cl'] = 'Clases recargadas';
+$text['label-reloaded_classes']['es-mx'] = 'Clases recargadas';
+$text['label-reloaded_classes']['fr-ca'] = 'Classes rechargées';
+$text['label-reloaded_classes']['fr-fr'] = 'Classes rechargées';
+$text['label-reloaded_classes']['he-il'] = 'שיעורים שנטענו מחדש';
+$text['label-reloaded_classes']['it-it'] = 'Classi ricaricate';
+$text['label-reloaded_classes']['ka-ge'] = 'გადატვირთული კლასები';
+$text['label-reloaded_classes']['nl-nl'] = 'Herladen klassen';
+$text['label-reloaded_classes']['pl-pl'] = 'Klasy przeładowane';
+$text['label-reloaded_classes']['pt-br'] = 'Classes recarregadas';
+$text['label-reloaded_classes']['pt-pt'] = 'Classes recarregadas';
+$text['label-reloaded_classes']['ro-ro'] = 'Cursuri reîncărcate';
+$text['label-reloaded_classes']['ru-ru'] = 'Перезагруженные классы';
+$text['label-reloaded_classes']['sv-se'] = 'Omladdade klasser';
+$text['label-reloaded_classes']['uk-ua'] = 'Перезавантажені класи';
+$text['label-reloaded_classes']['tr-tr'] = 'Yeniden yüklenen sınıflar';
+$text['label-reloaded_classes']['zh-cn'] = '重新加载的类';
+$text['label-reloaded_classes']['ja-jp'] = 'リロードされたクラス';
+$text['label-reloaded_classes']['ko-kr'] = '다시 로드된 클래스';
+
+$text['label-updated_cache']['en-us'] = 'Updated cache';
+$text['label-updated_cache']['en-gb'] = 'Updated cache';
+$text['label-updated_cache']['ar-eg'] = 'تم تحديث ذاكرة التخزين المؤقت';
+$text['label-updated_cache']['de-at'] = 'Cache aktualisiert';
+$text['label-updated_cache']['de-ch'] = 'Cache aktualisiert';
+$text['label-updated_cache']['de-de'] = 'Cache aktualisiert';
+$text['label-updated_cache']['el-gr'] = 'Ενημερώθηκε η προσωρινή μνήμη';
+$text['label-updated_cache']['es-cl'] = 'Caché actualizado';
+$text['label-updated_cache']['es-mx'] = 'Caché actualizado';
+$text['label-updated_cache']['fr-ca'] = 'Cache mis à jour';
+$text['label-updated_cache']['fr-fr'] = 'Cache mis à jour';
+$text['label-updated_cache']['he-il'] = 'מטמון מעודכן';
+$text['label-updated_cache']['it-it'] = 'Cache aggiornata';
+$text['label-updated_cache']['ka-ge'] = 'განახლებულია ქეში';
+$text['label-updated_cache']['nl-nl'] = 'Bijgewerkte cache';
+$text['label-updated_cache']['pl-pl'] = 'Zaktualizowano pamięć podręczną';
+$text['label-updated_cache']['pt-br'] = 'Cache atualizado';
+$text['label-updated_cache']['pt-pt'] = 'Cache atualizado';
+$text['label-updated_cache']['ro-ro'] = 'Cache actualizat';
+$text['label-updated_cache']['ru-ru'] = 'Обновлен кэш';
+$text['label-updated_cache']['sv-se'] = 'Uppdaterad cache';
+$text['label-updated_cache']['uk-ua'] = 'Оновлений кеш';
+$text['label-updated_cache']['tr-tr'] = 'Güncellenen önbellek';
+$text['label-updated_cache']['zh-cn'] = '更新缓存';
+$text['label-updated_cache']['ja-jp'] = 'キャッシュを更新しました';
+$text['label-updated_cache']['ko-kr'] = '캐시 업데이트됨';
diff --git a/core/upgrade/upgrade_menu.php b/core/upgrade/upgrade_menu.php
index 84c2115aca..d167930bd1 100644
--- a/core/upgrade/upgrade_menu.php
+++ b/core/upgrade/upgrade_menu.php
@@ -58,6 +58,11 @@ $display_type = 'text';
 //run
 show_upgrade_menu();
 
+/**
+ * Show upgrade menu
+ * @global type $text
+ * @global type $software_name
+ */
 function show_upgrade_menu() {
 	global $text, $software_name, $settings;
 	//error_reporting(E_ALL);
@@ -72,13 +77,14 @@ function show_upgrade_menu() {
 		echo "1) {$text['label-upgrade_source']} - {$text['description-update_all_source_files']}\n";
 		echo "  1a) " . $software_name . " - Update Main Software Only \n";
 		echo "  1b) {$text['label-update_external_repositories']} - {$text['description-repositories']}\n";
-		echo "2) {$text['label-schema']} - {$text['description-upgrade_schema']}\n";
-		echo "  2b) {$text['label-upgrade_data_types']} - {$text['description-upgrade_data_types']}\n";
-		echo "3) {$text['label-upgrade_apps']} - {$text['description-upgrade_apps']}\n";
-		echo "4) {$text['label-upgrade_menu']} - {$text['description-upgrade_menu']}\n";
-		echo "5) {$text['label-upgrade_permissions']} - {$text['description-upgrade_permissions']}\n";
-		echo "6) {$text['label-update_filesystem_permissions']} - {$text['description-update_filesystem_permissions']}\n";
-		echo "7) {$text['label-all_of_the_above']} - {$text['description-all_of_the_above']}\n";
+		echo "2) {$text['label-update_auto_loader']} - {$text['description-update_auto_loader']}\n";
+		echo "3) {$text['label-schema']} - {$text['description-upgrade_schema']}\n";
+		echo "  3b) {$text['label-upgrade_data_types']} - {$text['description-upgrade_data_types']}\n";
+		echo "4) {$text['label-upgrade_apps']} - {$text['description-upgrade_apps']}\n";
+		echo "5) {$text['label-upgrade_menu']} - {$text['description-upgrade_menu']}\n";
+		echo "6) {$text['label-upgrade_permissions']} - {$text['description-upgrade_permissions']}\n";
+		echo "7) {$text['label-update_filesystem_permissions']} - {$text['description-update_filesystem_permissions']}\n";
+		echo "8) {$text['label-all_of_the_above']} - {$text['description-all_of_the_above']}\n";
 		echo "0) Exit\n";
 		echo "\n";
 		echo "Choice: ";
@@ -95,32 +101,36 @@ function show_upgrade_menu() {
 				do_upgrade_code_submodules();
 				break;
 			case 2:
-				do_upgrade_schema();
-				break;
-			case '2b':
-				do_upgrade_schema(true);
+				do_upgrade_auto_loader();
 				break;
 			case 3:
-				do_upgrade_domains();
+				do_upgrade_schema();
+				break;
+			case '3b':
+				do_upgrade_schema(true);
 				break;
 			case 4:
-				do_upgrade_menu();
+				do_upgrade_domains();
 				break;
 			case 5:
-				do_upgrade_permissions();
+				do_upgrade_menu();
 				break;
 			case 6:
-				do_filesystem_permissions($text, $settings);
+				do_upgrade_permissions();
 				break;
 			case 7:
-				do_upgrade_code();
-				do_upgrade_schema();
-				do_upgrade_domains();
-				do_upgrade_menu();
-				do_upgrade_permissions();
 				do_filesystem_permissions($text, $settings);
 				break;
 			case 8:
+				do_upgrade_code();
+				do_upgrade_auto_loader();
+				do_upgrade_schema();
+				do_upgrade_domains();
+				do_upgrade_menu();
+				do_upgrade_permissions();
+				do_filesystem_permissions($text, $settings);
+				break;
+			case 9:
 				break;
 			case 0:
 				exit();
@@ -128,6 +138,23 @@ function show_upgrade_menu() {
 	}
 }
 
+/**
+ * Rebuild the cache file
+ * @global type $text
+ */
+function do_upgrade_auto_loader() {
+	global $text;
+	$loader = new auto_loader();
+	$loader->reload_classes();
+	echo "{$text['label-reloaded_classes']}\n";
+	if ($loader->update_cache()) {
+		echo "{$text['label-updated_cache']}\n";
+	}
+}
+
+/**
+ * Show the software version
+ */
 function do_filesystem_permissions($text, settings $settings) {
 
 	echo ($text['label-header1'] ?? "Root account or sudo account must be used for this option") . "\n";
@@ -185,6 +212,10 @@ function show_software_version() {
 	echo software::version() . "\n";
 }
 
+/**
+ * Upgrade the source folder
+ * @return type
+ */
 function do_upgrade_code() {
 	//assume failed
 	$result = ['result' => false, 'message' => 'Failed'];
@@ -199,6 +230,10 @@ function do_upgrade_code() {
 	return;
 }
 
+/**
+ * Upgrade any of the git submodules
+ * @global type $text
+ */
 function do_upgrade_code_submodules() {
 	global $text;
 	$updateable_repos = git_find_repos(dirname(__DIR__, 2)."/app");
@@ -223,7 +258,9 @@ function do_upgrade_code_submodules() {
 	}
 }
 
-//run all app_defaults.php files
+/**
+ * Execute all app_defaults.php files
+ */
 function do_upgrade_domains() {
 	require_once dirname(__DIR__, 2) . "/resources/classes/config.php";
 	require_once dirname(__DIR__, 2) . "/resources/classes/domains.php";
@@ -232,7 +269,9 @@ function do_upgrade_domains() {
 	$domain->upgrade();
 }
 
-//upgrade schema and/or data_types
+/**
+ * Upgrade schema and/or data_types
+ */
 function do_upgrade_schema(bool $data_types = false) {
 	//get the database schema put it into an array then compare and update the database as needed.
 	require_once dirname(__DIR__, 2) . "/resources/classes/schema.php";
@@ -241,7 +280,9 @@ function do_upgrade_schema(bool $data_types = false) {
 	echo $obj->schema('text');
 }
 
-//restore the default menu
+/**
+ * Restore the default menu
+ */
 function do_upgrade_menu() {
 	global $included, $sel_menu, $menu_uuid, $menu_language;
 	//get the menu uuid and language
@@ -273,7 +314,9 @@ function do_upgrade_menu() {
 	}
 }
 
-//restore the default permissions
+/**
+ * Restore the default permissions
+ */
 function do_upgrade_permissions() {
 	global $included;
 	//default the permissions
@@ -285,7 +328,9 @@ function do_upgrade_permissions() {
 	echo $text['message-upgrade_permissions'] . "\n";
 }
 
-//default upgrade schema and app defaults
+/**
+ * Default upgrade schema and app defaults
+ */
 function do_upgrade_defaults() {
 	//add multi-lingual support
 	$language = new text;
@@ -309,6 +354,10 @@ function do_upgrade_defaults() {
 	echo "\n";
 }
 
+/**
+ * Load the old config.php file
+ * @return type
+ */
 function load_config_php() {
 	//if the config file doesn't exist and the config.php does exist use it to write a new config file
 	//include the config.php
diff --git a/resources/classes/auto_loader.php b/resources/classes/auto_loader.php
index e0a5d76e86..cef6581f52 100644
--- a/resources/classes/auto_loader.php
+++ b/resources/classes/auto_loader.php
@@ -26,27 +26,85 @@
 
 class auto_loader {
 
-	public function __construct() {
+	const FILE = 'autoloader_cache.php';
+
+	private $classes;
+
+	public function __construct($project_path = '') {
+		//classes must be loaded before this object is registered
+		if (!$this->load_cache()) {
+			$this->reload_classes($project_path);
+		}
+		//register this object to load any unknown classes
 		spl_autoload_register(array($this, 'loader'));
 	}
 
-	public static function autoload_search($array) : string {
-		if (!is_array($array) && count($path) != 0) {
-			return '';
+	public function update_cache(string $file = ''): bool {
+		//ensure we have somewhere to put the file
+		if (empty($file)) {
+			$file = sys_get_temp_dir() . '/' . self::FILE;
 		}
-		foreach($array as $path) {
-			if (is_array($path) && count($path) != 0) {
-				foreach($path as $sub_path) {
-					if (!empty($sub_path) && file_exists($sub_path)) {
-						return $sub_path;
-					}
-				}
+
+		//guard against writing an empty file
+		if (!empty($this->classes)) {
+			//export the classes array using PHP engine
+			$data = var_export($this->classes, true);
+
+			//put the array in a form that it can be loaded directly to an array
+			$result = file_put_contents($file, "<?php\n return " . $data . ";\n");
+			if ($result !== false) {
+				return true;
 			}
-			elseif (!empty($path) && file_exists($path)) {
-				return $path;
+			$error_array = error_get_last();
+			//send to syslog when debugging
+			if (!empty($_REQUEST['debug']) && $_REQUEST['debug'] == 'true') {
+				openlog("PHP", LOG_PID | LOG_PERROR, LOG_LOCAL0);
+				syslog(LOG_WARNING, "[php][auto_loader] " . $error_array['message']);
+				closelog();
 			}
 		}
-		return '';
+		return false;
+	}
+
+	public function load_cache(string $file = ''): bool {
+		$this->classes = [];
+		//use a standard file
+		if (empty($file)) {
+			$file = sys_get_temp_dir() . '/'. self::FILE;
+		}
+		//use PHP engine to parse it
+		if (file_exists($file)) {
+			$this->classes = include $file;
+		}
+		//assign to an array
+		if (!empty($this->classes)) {
+			return true;
+		}
+		return false;
+	}
+
+	public function reload_classes($project_path = '') {
+		//set project path using magic dir constant
+		if (empty($project_path)) {
+			$project_path = dirname(__DIR__, 2);
+		}
+
+		//build the array of all classes
+		$search_path = [];
+		$search_path = array_merge($search_path, glob($project_path . '/resources/classes/*.php'));
+		$search_path = array_merge($search_path, glob($project_path . '/resources/interfaces/*.php'));
+		$search_path = array_merge($search_path, glob($project_path . '/resources/traits/*.php'));
+		$search_path = array_merge($search_path, glob($project_path . '/*/*/resources/classes/*.php'));
+		$search_path = array_merge($search_path, glob($project_path . '/*/*/resources/interfaces/*.php'));
+		$search_path = array_merge($search_path, glob($project_path . '/*/*/resources/traits/*.php'));
+
+		//reset the current array
+		$this->classes = [];
+
+		//store the class name (key) and the path (value)
+		foreach ($search_path as $path) {
+			$this->classes[basename($path, '.php')] = $path;
+		}
 	}
 
 	private function loader($class_name) : bool {
@@ -54,40 +112,23 @@ class auto_loader {
 		//sanitize the class name
 		$class_name = preg_replace('[^a-zA-Z0-9_]', '', $class_name);
 
-		//use glob for a more extensive search for the classes (note: GLOB_BRACE doesn't work on some systems)
-		if (!class_exists($class_name)) {
-			//set project path using magic dir constant
-			$project_path = dirname(__DIR__, 2);
+		//find the path using the class_name as the key in the classes array
+		if (isset($this->classes[$class_name])) {
+			//include the class or interface
+			include_once $this->classes[$class_name];
 
-			//build the search path array
-			$search_path[] = glob($project_path . "/resources/classes/".$class_name.".php");
-			$search_path[] = glob($project_path . "/resources/interfaces/".$class_name.".php");
-			$search_path[] = glob($project_path . "/resources/traits/".$class_name.".php");
-			$search_path[] = glob($project_path . "/*/*/resources/classes/".$class_name.".php");
-			$search_path[] = glob($project_path . "/*/*/resources/interfaces/".$class_name.".php");
-			$search_path[] = glob($project_path . "/*/*/resources/traits/".$class_name.".php");
+			//return boolean
+			return true;
+		}
 
-			//find the path
-			$path = self::autoload_search($search_path);
-			if (!empty($path)) {
-				//send to syslog
-				if (!empty($_REQUEST['debug']) && $_REQUEST['debug'] == 'true') {
-					openlog("PHP", LOG_PID | LOG_PERROR, LOG_LOCAL0);
-					syslog(LOG_WARNING, "[php][autoloader] name: ".$class_name.", path: ".$path.", line: ".__line__);
-					closelog();
-				}
-
-				//include the class or interface
-				include $path;
-
-				//return boolean
-				return true;
-			}
+		//send to syslog when debugging
+		if (!empty($_REQUEST['debug']) && $_REQUEST['debug'] == 'true') {
+			openlog("PHP", LOG_PID | LOG_PERROR, LOG_LOCAL0);
+			syslog(LOG_WARNING, "[php][auto_loader] class not found name: ".$class_name);
+			closelog();
 		}
 
 		//return boolean
 		return false;
 	}
 }
-
-?>

From bd5002ca32a8aefb76d69c0cfef4a2507fa244c1 Mon Sep 17 00:00:00 2001
From: fusionate <nate@fusionpbx.com>
Date: Thu, 13 Feb 2025 15:02:53 -0700
Subject: [PATCH 13/55] Voicemail: Rename voicemail filesystem folder if
 Voicemail ID changes.

---
 app/voicemails/voicemail_edit.php | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/app/voicemails/voicemail_edit.php b/app/voicemails/voicemail_edit.php
index 4785ad81da..a5aaec41da 100644
--- a/app/voicemails/voicemail_edit.php
+++ b/app/voicemails/voicemail_edit.php
@@ -89,6 +89,7 @@
 
 		//set the variables from the HTTP values
 			$voicemail_id = $_POST["voicemail_id"];
+			$voicemail_id_previous = $_POST["voicemail_id_previous"];
 			$voicemail_password = $_POST["voicemail_password"];
 			$greeting_id = $_POST["greeting_id"];
 			$voicemail_options = $_POST["voicemail_options"];
@@ -261,9 +262,21 @@
 					$p->delete('voicemail_option_add', 'temp');
 					$p->delete('voicemail_destination_add', 'temp');
 
-				//make sure the voicemail directory exists
+				//create or rename voicemail directory as needed
 					if (is_numeric($voicemail_id)) {
-						if (!file_exists($_SESSION['switch']['voicemail']['dir']."/default/".$_SESSION['domain_name']."/".$voicemail_id)) {
+						// old and new voicemail ids differ, old directory exists and new doesn't, rename directory
+						if (
+							!empty($voicemail_id_previous) && is_numeric($voicemail_id_previous) && $voicemail_id_previous != $voicemail_id &&
+							file_exists($_SESSION['switch']['voicemail']['dir']."/default/".$_SESSION['domain_name']."/".$voicemail_id_previous) &&
+							!file_exists($_SESSION['switch']['voicemail']['dir']."/default/".$_SESSION['domain_name']."/".$voicemail_id)
+							) {
+							rename(
+								$_SESSION['switch']['voicemail']['dir']."/default/".$_SESSION['domain_name']."/".$voicemail_id_previous, // previous
+								$_SESSION['switch']['voicemail']['dir']."/default/".$_SESSION['domain_name']."/".$voicemail_id // new
+								);
+						}
+						// new directory doesn't exist, create
+						else if (!file_exists($_SESSION['switch']['voicemail']['dir']."/default/".$_SESSION['domain_name']."/".$voicemail_id)) {
 							mkdir($_SESSION['switch']['voicemail']['dir']."/default/".$_SESSION['domain_name']."/".$voicemail_id, 0770);
 						}
 					}
@@ -560,6 +573,7 @@
 	echo "</td>\n";
 	echo "<td width='70%' class='vtable' align='left'>\n";
 	echo "	<input class='formfld' type='text' name='voicemail_id' maxlength='255' autocomplete='new-password' value='".escape($voicemail_id)."'>\n";
+	echo "	<input type='hidden' name='voicemail_id_previous' value='".escape($voicemail_id)."'>\n";
 	echo "	<input type='text' style='display: none;' disabled='disabled'>\n"; //help defeat browser auto-fill
 	echo "<br />\n";
 	echo $text['description-voicemail_id']."\n";

From c4aa9e9b02d16e02952fc0c6eb71572a655639ce Mon Sep 17 00:00:00 2001
From: FusionPBX <mark@fusionpbx.com>
Date: Thu, 13 Feb 2025 15:05:27 -0700
Subject: [PATCH 14/55] Update the cache after loading classes array

---
 resources/classes/auto_loader.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/classes/auto_loader.php b/resources/classes/auto_loader.php
index cef6581f52..65d85afe06 100644
--- a/resources/classes/auto_loader.php
+++ b/resources/classes/auto_loader.php
@@ -105,6 +105,9 @@ class auto_loader {
 		foreach ($search_path as $path) {
 			$this->classes[basename($path, '.php')] = $path;
 		}
+
+		//update the cache after loading classes array
+		$this->update_cache();
 	}
 
 	private function loader($class_name) : bool {

From f11c792c2facd1c7eb3a6c0bb64f76a37442fc4c Mon Sep 17 00:00:00 2001
From: FusionPBX <mark@fusionpbx.com>
Date: Thu, 13 Feb 2025 21:51:50 -0700
Subject: [PATCH 15/55] Fix the fifo agent delete

---
 app/fifo/fifo_edit.php | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/app/fifo/fifo_edit.php b/app/fifo/fifo_edit.php
index 0087904d74..ef1d4cf2a1 100644
--- a/app/fifo/fifo_edit.php
+++ b/app/fifo/fifo_edit.php
@@ -396,14 +396,11 @@
 	echo "	<div class='heading'><b>".$text['title-fifo']."</b></div>\n";
 	echo "	<div class='actions'>\n";
 	echo button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>$button_icon_back,'id'=>'btn_back','collapse'=>'hide-xs','style'=>'margin-right: 15px;','link'=>'fifo.php']);
-// 	if ($action == 'update') {
-// 		if (permission_exists('fifo_member_add')) {
-// 			echo button::create(['type'=>'button','label'=>$text['button-copy'],'icon'=>$button_icon_copy,'id'=>'btn_copy','name'=>'btn_copy','style'=>'display: none;','onclick'=>"modal_open('modal-copy','btn_copy');"]);
-// 		}
-// 		if (permission_exists('fifo_member_delete')) {
-// 			echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$button_icon_delete,'id'=>'btn_delete','name'=>'btn_delete','style'=>'display: none; margin-right: 15px;','onclick'=>"modal_open('modal-delete','btn_delete');"]);
-// 		}
-// 	}
+ 	if ($action == 'update') {
+ 		if (permission_exists('fifo_member_delete')) {
+ 			echo button::create(['type'=>'submit','label'=>$text['button-delete'],'icon'=>$button_icon_delete,'id'=>'btn_delete','name'=>'action','value'=>'delete','style'=>'display: none; margin-right: 15px;']);
+ 		}
+ 	}
 	echo button::create(['type'=>'submit','label'=>$text['button-save'],'icon'=>$button_icon_save,'id'=>'btn_save','collapse'=>'hide-xs']);
 	echo "	</div>\n";
 	echo "	<div style='clear: both;'></div>\n";
@@ -482,7 +479,7 @@
 	echo "			<th class='vtablereq'>".$text['label-member_enabled']."</th>\n";
 	if (is_array($fifo_members) && @sizeof($fifo_members) > 1 && permission_exists('fifo_member_delete')) {
 		echo "			<td class='vtable edit_delete_checkbox_all' onmouseover=\"swap_display('delete_label_details', 'delete_toggle_details');\" onmouseout=\"swap_display('delete_label_details', 'delete_toggle_details');\">\n";
-		echo "				<span id='delete_label_details'>".$text['label-action']."</span>\n";
+		echo "				<span id='delete_label_details'>".$text['label-delete']."</span>\n";
 		echo "				<span id='delete_toggle_details'><input type='checkbox' id='checkbox_all_details' name='checkbox_all' onclick=\"edit_all_toggle('details'); checkbox_on_change(this);\"></span>\n";
 		echo "			</td>\n";
 	}
@@ -497,9 +494,9 @@
 			if (empty($row["member_wrap_up_time"])) { $row["member_wrap_up_time"] = '10'; }
 
 			echo "			<tr>\n";
-			echo "			<input type='hidden' name='fifo_members[$x][domain_uuid]' value=\"".escape($row["domain_uuid"])."\">\n";
-			echo "			<input type='hidden' name='fifo_members[$x][fifo_uuid]' value=\"".escape($row["fifo_uuid"])."\">\n";
-			echo "			<input type='hidden' name='fifo_members[$x][fifo_member_uuid]' value=\"".escape($row["fifo_member_uuid"])."\">\n";
+			echo "				<input type='hidden' name='fifo_members[$x][domain_uuid]' value=\"".escape($row["domain_uuid"])."\">\n";
+			echo "				<input type='hidden' name='fifo_members[$x][fifo_uuid]' value=\"".escape($row["fifo_uuid"])."\">\n";
+			echo "				<input type='hidden' name='fifo_members[$x][fifo_member_uuid]' value=\"".escape($row["fifo_member_uuid"])."\">\n";
 			echo "				<td class='formfld'>\n";
 			echo "					$member_contact\n";
 			echo "			</td>\n";

From 9d3dd2a8317d9a7427e6dfa57d257bb3aad5e0fc Mon Sep 17 00:00:00 2001
From: FusionPBX <markjcrane@gmail.com>
Date: Fri, 14 Feb 2025 13:08:19 -0700
Subject: [PATCH 16/55] Add two fax variables

---
 app/fax/fax_send.php                     | 4 +++-
 app/fax_queue/resources/job/fax_send.php | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/fax/fax_send.php b/app/fax/fax_send.php
index 9b1fc3650d..9c6b59e9f7 100644
--- a/app/fax/fax_send.php
+++ b/app/fax/fax_send.php
@@ -752,7 +752,7 @@ if (!function_exists('fax_split_dtmf')) {
 		$fax_file = $dir_fax_sent."/".$fax_instance_uuid.".tif";
 		$common_variables = "fax_queue_uuid=".$fax_queue_uuid.",";
 		$common_variables .= "fax_uuid="   . $fax_uuid . ",";
-		//$common_variables .= "accountcode='".$fax_accountcode."',";
+		$common_variables .= "accountcode='".$fax_accountcode."',";
 		$common_variables .= "sip_h_accountcode='".$fax_accountcode."',";
 		$common_variables .= "domain_uuid=".$domain_uuid.",";
 		$common_variables .= "domain_name=".$domain_name.",";
@@ -766,6 +766,8 @@ if (!function_exists('fax_split_dtmf')) {
 		if (!empty($provider_prefix)) {
 			$common_variables .= "provider_prefix='".$provider_prefix."',";
 		}
+		$common_variables .= "hangup_after_bridge=true,";
+		$common_variables .= "continue_on_fail=true,";
 
 		if (!empty($fax_numbers)) {
 			foreach ($fax_numbers as $fax_number) {
diff --git a/app/fax_queue/resources/job/fax_send.php b/app/fax_queue/resources/job/fax_send.php
index b2fc4d3206..5750531d17 100644
--- a/app/fax_queue/resources/job/fax_send.php
+++ b/app/fax_queue/resources/job/fax_send.php
@@ -310,6 +310,8 @@
 			$common_variables .= "fax_ident='"                   . escape_quote($fax_caller_id_number) . "',";
 			$common_variables .= "fax_header='"                  . escape_quote($fax_caller_id_name) . "',";
 			$common_variables .= "fax_file='"                    . escape_quote($fax_file) . "',";
+			$common_variables .= "hangup_after_bridge=true,";
+			$common_variables .= "continue_on_fail=true,";
 
 		//add the fax destination number variables
 			if ($local_destination) {

From 27e32e8f34079054f3353a5dccdadd17b9911a36 Mon Sep 17 00:00:00 2001
From: FusionPBX <mark@fusionpbx.com>
Date: Fri, 14 Feb 2025 15:50:51 -0700
Subject: [PATCH 17/55] Send the fax with primary and alternative routes

---
 app/fax_queue/resources/job/fax_send.php | 76 +++++++++++++++++-------
 1 file changed, 56 insertions(+), 20 deletions(-)

diff --git a/app/fax_queue/resources/job/fax_send.php b/app/fax_queue/resources/job/fax_send.php
index 5750531d17..515364fa40 100644
--- a/app/fax_queue/resources/job/fax_send.php
+++ b/app/fax_queue/resources/job/fax_send.php
@@ -224,6 +224,23 @@
 //sending the fax
 	if ($fax_status == 'waiting' || $fax_status == 'trying' || $fax_status == 'busy') {
 
+		//get the provider_prefix from the domain_variables dialplan
+			$sql = "select dialplan_detail_data from v_dialplan_details ";
+			$sql .= "where dialplan_uuid in ( ";
+			$sql .= "	select dialplan_uuid from v_dialplans ";
+			$sql .= "	where dialplan_name = 'domain-variables' ";
+			$sql .= "	and domain_uuid = :domain_uuid ";
+			$sql .= ")	";
+			$sql .= "and dialplan_detail_data like 'provider_prefix%' ";
+			$sql .= "and dialplan_detail_enabled = 'true' ";
+			$parameters['domain_uuid'] = $domain_uuid;
+			$row = $database->select($sql, $parameters, 'row');
+			$dialplan_detail_data = $row["dialplan_detail_data"];
+			unset($sql, $parameters, $row);
+			if (!empty($dialplan_detail_data)) {
+				$provider_prefix = explode('=', $dialplan_detail_data)[1];
+			}
+
 		//create event socket handle
 			$esl = event_socket::create();
 			if (!$esl->is_connected()) {
@@ -319,9 +336,13 @@
 				$common_variables .= "sip_req_user=".$fax_number.",";
 			}
 
+
 		//prepare the fax command
+			$channel_variables["toll_allow"] = !empty($fax_toll_allow) ? $fax_toll_allow : null;
+			$route_array = outbound_route_to_bridge($domain_uuid, $fax_prefix . $fax_number, $channel_variables);
+
 			if (empty($route_array)) {
-				$route_array = outbound_route_to_bridge($domain_uuid, $fax_prefix . $fax_number, $channel_variables);
+				//send the internal call to the registered extension
 				if (count($route_array) == 0) {
 					//check for valid extension
 					$sql = "select count(extension_uuid) ";
@@ -333,18 +354,36 @@
 					$extension_count = $database->select($sql, $parameters, 'column');
 					if ($extension_count > 0) {
 						//send the internal call to the registered extension
-						$route_array[] = "user/".$fax_number."@".$domain_name;
+						$fax_uri = "user/".$fax_number."@".$domain_name;
 					}
 					else {
+						$fax_uri = '';
 						$fax_status = 'failed';
 					}
 				}
 			}
+			else {
+				foreach($route_array as $key => $bridge) {
+					//add the bridge to the fax_uri, after first iteration add the delimiter
+					if ($key == 0) {
+						$fax_uri = $bridge;
+					}
+					else {
+						$fax_uri .= '|'.$bridge;
+					}
+
+					//add the provider_prefix
+					if (!empty($provider_prefix)) {
+						$fax_uri = preg_replace('/\${provider_prefix}/', $provider_prefix, $fax_uri);
+					}
+
+					//remove switch ${variables} from the bridge statement
+					$fax_uri = preg_replace('/\${[^}]+}/', '', $fax_uri);
+				}
+			}
 
 		//set the origination uuid
-			if (!is_uuid($origination_uuid)) { 
-				$origination_uuid = uuid();
-			}
+			$origination_uuid = uuid();
 
 		//build a list of fax variables
 			$dial_string = $common_variables;
@@ -366,21 +405,18 @@
 		//connect to event socket and send the command
 			if ($fax_status != 'failed' && file_exists($fax_file)) {
 				//send the fax and try another route if the fax fails
-				foreach($route_array as $route) {
-					$fax_command  = "originate {" . $dial_string . ",fax_uri=".$route."}" . $route." &txfax('".$fax_file."')";
-					$fax_response = event_socket::api($fax_command);
-					$response = str_replace("\n", "", $fax_response);
-					$response = trim(str_replace("+OK", "", $response));
-					if (is_uuid($response)) {
-						//originate command accepted
-						$uuid = $response;
-						echo "uuid: ".$uuid."\n";
-						break;
-					}
-					else {
-						//originate command failed (-ERR INVALID_GATEWAY or other errors)
-						echo "response: ".$response."\n";
-					}
+				$fax_command  = "originate {" . $dial_string . ",fax_uri=".$fax_uri."}" . $fax_uri." &txfax('".$fax_file."')";
+				$fax_response = event_socket::api($fax_command);
+				$response = str_replace("\n", "", $fax_response);
+				$response = trim(str_replace("+OK", "", $response));
+				if (is_uuid($response)) {
+					//originate command accepted
+					$uuid = $response;
+					echo "uuid: ".$uuid."\n";
+				}
+				else {
+					//originate command failed (-ERR INVALID_GATEWAY or other errors)
+					echo "response: ".$response."\n";
 				}
 
 				//set the fax file name without the extension

From dc0f1464854aacbb750f5d8926d4e07e57394c12 Mon Sep 17 00:00:00 2001
From: frytimo <tim@fusionpbx.com>
Date: Sat, 15 Feb 2025 13:43:03 -0400
Subject: [PATCH 18/55] fix php warning in menu class (#7256)

initialize variable before use
---
 resources/classes/menu.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/classes/menu.php b/resources/classes/menu.php
index 80f5718fc7..86c8b8983c 100644
--- a/resources/classes/menu.php
+++ b/resources/classes/menu.php
@@ -1238,6 +1238,7 @@ if (!class_exists('menu')) {
 					$html .= "	<div style='height: 100px;'></div>\n";
 				}
 			$html .= "</div>\n";
+			$content_container_onclick = "";
 			if ($menu_side_state != 'expanded') {
 				$content_container_onclick = "onclick=\"clearTimeout(menu_side_contract_timer); if ($(window).width() >= 576) { menu_side_contract(); }\"";
 			}

From 5e6ec475dfe23bf017dfbbf1564bc2ac6288e85d Mon Sep 17 00:00:00 2001
From: frytimo <tim@fusionpbx.com>
Date: Sat, 15 Feb 2025 13:44:46 -0400
Subject: [PATCH 19/55] update auto_loader cache file when updating (#7255)

---
 core/upgrade/index.php            | 39 +++++++++++++++++++++----
 core/upgrade/upgrade.php          |  5 ++++
 core/upgrade/upgrade_menu.php     | 47 +++++++++++++++++++------------
 resources/classes/auto_loader.php |  5 ++--
 4 files changed, 71 insertions(+), 25 deletions(-)

diff --git a/core/upgrade/index.php b/core/upgrade/index.php
index 8c74e89acd..f9ed6c7c77 100644
--- a/core/upgrade/index.php
+++ b/core/upgrade/index.php
@@ -43,13 +43,13 @@
 		exit;
 	}
 
-//connect to the database
-	$database = new database;
-
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
 
+//connect to the database
+	$database = database::new();
+
 //set a default message_timeout
 	$message_timeout = 4*1000;
 
@@ -76,7 +76,7 @@
 //process the http post
 	if (!empty($_POST) && @sizeof($_POST) > 0) {
 
-		//get the action options: source, schema, app_defaults, menu_defaults, permisisons
+		//get the action options: source, schema, app_defaults, menu_defaults, permissions
 		$action = $_POST['action'] ?? null;
 
 		//run source update
@@ -92,6 +92,12 @@
 			else {
 				message::add($text['message-upgrade_source_failed'], 'negative', $message_timeout);
 			}
+
+			global $autoload;
+			if ($autoload !== null && $autoload instanceof auto_loader) {
+				$autoload->reload_classes();
+				$autoload->update_cache();
+			}
 		}
 
 		//run optional app source updates
@@ -116,6 +122,13 @@
 			if ($apps_updated != 0) { message::add($text['message-optional_apps_upgrade_source'], null, $message_timeout); }
 			if ($apps_failed != 0) { message::add($text['message-optional_apps_upgrade_source_failed'], 'negative', $message_timeout); }
 
+			//update the auto_loader cache just-in-case the source files have updated
+			global $autoload;
+			if ($autoload !== null && $autoload instanceof auto_loader) {
+				$autoload->reload_classes();
+				$autoload->update_cache();
+			}
+
 		}
 
 		//load an array of the database schema and compare it with the active database
@@ -131,7 +144,13 @@
 
 		//process the apps defaults
 		if (!empty($action["app_defaults"]) && permission_exists("upgrade_apps")) {
-			require_once "resources/classes/domains.php";
+			//update the auto_loader cache just-in-case the source files have updated
+			global $autoload;
+			if ($autoload !== null && $autoload instanceof auto_loader) {
+				$autoload->reload_classes();
+				$autoload->update_cache();
+			}
+
 			$domain = new domains;
 			$domain->upgrade();
 			message::add($text['message-upgrade_apps'], null, $message_timeout);
@@ -139,6 +158,11 @@
 
 		//restore defaults of the selected menu
 		if (!empty($action["menu_defaults"]) && permission_exists("menu_restore")) {
+			global $autoload;
+			if ($autoload !== null && $autoload instanceof auto_loader) {
+				$autoload->reload_classes();
+				$autoload->update_cache();
+			}
 			$sel_menu = explode('|', check_str($_POST["sel_menu"]));
 			$menu_uuid = $sel_menu[0];
 			$menu_language = $sel_menu[1];
@@ -151,6 +175,11 @@
 
 		//restore default permissions
 		if (!empty($action["permission_defaults"]) && permission_exists("group_edit")) {
+			global $autoload;
+			if ($autoload !== null && $autoload instanceof auto_loader) {
+				$autoload->reload_classes();
+				$autoload->update_cache();
+			}
 			$included = true;
 			require_once("core/groups/permissions_default.php");
 			$text = $language->get(null, '/core/upgrade');
diff --git a/core/upgrade/upgrade.php b/core/upgrade/upgrade.php
index e196cb4193..376c3b0a22 100644
--- a/core/upgrade/upgrade.php
+++ b/core/upgrade/upgrade.php
@@ -177,6 +177,11 @@
 		exit();
 	}
 
+//always update the auto_loader cache just-in-case the source files have updated
+	$auto_loader = new auto_loader();
+	$auto_loader->reload_classes();
+	$auto_loader->update_cache();
+
 //get the version of the software
 	if ($upgrade_type == 'version') {
 		echo software::version()."\n";
diff --git a/core/upgrade/upgrade_menu.php b/core/upgrade/upgrade_menu.php
index d167930bd1..e2497f80f9 100644
--- a/core/upgrade/upgrade_menu.php
+++ b/core/upgrade/upgrade_menu.php
@@ -77,14 +77,13 @@ function show_upgrade_menu() {
 		echo "1) {$text['label-upgrade_source']} - {$text['description-update_all_source_files']}\n";
 		echo "  1a) " . $software_name . " - Update Main Software Only \n";
 		echo "  1b) {$text['label-update_external_repositories']} - {$text['description-repositories']}\n";
-		echo "2) {$text['label-update_auto_loader']} - {$text['description-update_auto_loader']}\n";
-		echo "3) {$text['label-schema']} - {$text['description-upgrade_schema']}\n";
-		echo "  3b) {$text['label-upgrade_data_types']} - {$text['description-upgrade_data_types']}\n";
-		echo "4) {$text['label-upgrade_apps']} - {$text['description-upgrade_apps']}\n";
-		echo "5) {$text['label-upgrade_menu']} - {$text['description-upgrade_menu']}\n";
-		echo "6) {$text['label-upgrade_permissions']} - {$text['description-upgrade_permissions']}\n";
-		echo "7) {$text['label-update_filesystem_permissions']} - {$text['description-update_filesystem_permissions']}\n";
-		echo "8) {$text['label-all_of_the_above']} - {$text['description-all_of_the_above']}\n";
+		echo "2) {$text['label-schema']} - {$text['description-upgrade_schema']}\n";
+		echo "  2b) {$text['label-upgrade_data_types']} - {$text['description-upgrade_data_types']}\n";
+		echo "3) {$text['label-upgrade_apps']} - {$text['description-upgrade_apps']}\n";
+		echo "4) {$text['label-upgrade_menu']} - {$text['description-upgrade_menu']}\n";
+		echo "5) {$text['label-upgrade_permissions']} - {$text['description-upgrade_permissions']}\n";
+		echo "6) {$text['label-update_filesystem_permissions']} - {$text['description-update_filesystem_permissions']}\n";
+		echo "7) {$text['label-all_of_the_above']} - {$text['description-all_of_the_above']}\n";
 		echo "0) Exit\n";
 		echo "\n";
 		echo "Choice: ";
@@ -93,35 +92,39 @@ function show_upgrade_menu() {
 			case 1:
 				do_upgrade_code();
 				do_upgrade_code_submodules();
+				do_upgrade_auto_loader();
 				break;
 			case '1a':
 				do_upgrade_code();
+				do_upgrade_auto_loader();
 				break;
 			case '1b':
 				do_upgrade_code_submodules();
-				break;
-			case 2:
 				do_upgrade_auto_loader();
 				break;
-			case 3:
+			case 2:
 				do_upgrade_schema();
 				break;
-			case '3b':
+			case '2b':
 				do_upgrade_schema(true);
 				break;
-			case 4:
+			case 3:
+				do_upgrade_auto_loader();
 				do_upgrade_domains();
 				break;
-			case 5:
+			case 4:
+				do_upgrade_auto_loader();
 				do_upgrade_menu();
 				break;
-			case 6:
+			case 5:
+				do_upgrade_auto_loader();
 				do_upgrade_permissions();
 				break;
-			case 7:
+			case 6:
+				do_upgrade_auto_loader();
 				do_filesystem_permissions($text, $settings);
 				break;
-			case 8:
+			case 7:
 				do_upgrade_code();
 				do_upgrade_auto_loader();
 				do_upgrade_schema();
@@ -133,6 +136,7 @@ function show_upgrade_menu() {
 			case 9:
 				break;
 			case 0:
+			case 'q':
 				exit();
 		}
 	}
@@ -144,16 +148,21 @@ function show_upgrade_menu() {
  */
 function do_upgrade_auto_loader() {
 	global $text;
+	//remove temp file
+	unlink(sys_get_temp_dir() . '/' . auto_loader::FILE);
+	//create a new instance of the autoloader
 	$loader = new auto_loader();
+	//reload the classes
 	$loader->reload_classes();
 	echo "{$text['label-reloaded_classes']}\n";
+	//re-create cache file
 	if ($loader->update_cache()) {
 		echo "{$text['label-updated_cache']}\n";
 	}
 }
 
 /**
- * Show the software version
+ * Update file system permissions
  */
 function do_filesystem_permissions($text, settings $settings) {
 
@@ -185,6 +194,8 @@ function do_filesystem_permissions($text, settings $settings) {
 		if ($log_directory !== null) {
 			$directories[] = $log_directory . '/xml_cdr';
 		}
+		//update the auto_loader cache permissions file
+		$directories[] = sys_get_temp_dir() . '/' . auto_loader::FILE;
 		//execute chown command for each directory
 		foreach ($directories as $dir) {
 			if ($dir !== null) {
diff --git a/resources/classes/auto_loader.php b/resources/classes/auto_loader.php
index 65d85afe06..fcb0b4fce3 100644
--- a/resources/classes/auto_loader.php
+++ b/resources/classes/auto_loader.php
@@ -33,7 +33,10 @@ class auto_loader {
 	public function __construct($project_path = '') {
 		//classes must be loaded before this object is registered
 		if (!$this->load_cache()) {
+			//cache miss so load them
 			$this->reload_classes($project_path);
+			//update the cache after loading classes array
+			$this->update_cache();
 		}
 		//register this object to load any unknown classes
 		spl_autoload_register(array($this, 'loader'));
@@ -106,8 +109,6 @@ class auto_loader {
 			$this->classes[basename($path, '.php')] = $path;
 		}
 
-		//update the cache after loading classes array
-		$this->update_cache();
 	}
 
 	private function loader($class_name) : bool {

From 7c25ad1ed7a8e8d0ede2daba40b5b7ee6c353195 Mon Sep 17 00:00:00 2001
From: FusionPBX <mark@fusionpbx.com>
Date: Sat, 15 Feb 2025 12:09:46 -0700
Subject: [PATCH 20/55] Disable vad for flying voice by default

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

diff --git a/app/flyingvoice/app_config.php b/app/flyingvoice/app_config.php
index 67f9c12630..a2357bb0e4 100644
--- a/app/flyingvoice/app_config.php
+++ b/app/flyingvoice/app_config.php
@@ -980,7 +980,7 @@
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "flyingvoice_voice_vad";
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
-		$apps[$x]['default_settings'][$y]['default_setting_value'] = "1";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "0";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set 1 = On, 0 = Off (default)";
 		$y++;

From 535d0395e66dc7b36d0a980ff24b127fca376415 Mon Sep 17 00:00:00 2001
From: FusionPBX <mark@fusionpbx.com>
Date: Sat, 15 Feb 2025 14:38:39 -0700
Subject: [PATCH 21/55] Update {$mac}.cfg

required for firmware .160 and newer
account.{$row.line_number}.sip_server.1.address

required for firmware .125 and older
account.{$row.line_number}.sip_server_host
---
 resources/templates/provision/yealink/t4x/{$mac}.cfg | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/resources/templates/provision/yealink/t4x/{$mac}.cfg b/resources/templates/provision/yealink/t4x/{$mac}.cfg
index bd77fa8714..97a46c35c9 100644
--- a/resources/templates/provision/yealink/t4x/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t4x/{$mac}.cfg
@@ -5,7 +5,7 @@
 
 {foreach $lines as $row}
 #######################################################################################
-##                           Account {$row.line_number} Basic Settings                                ##
+##                           Account {$row.line_number} Basic Settings               ##
 #######################################################################################
 ## ranges from 1 to 16
 
@@ -26,9 +26,13 @@ account.{$row.line_number}.user_name = {$account.{$row.line_number}.user_id}
 {/if}
 
 {if isset($row.server.1.address)}
-account.{$row.line_number}.sip_server.1.address = {$row.server.1.address} 
+account.{$row.line_number}.sip_server.1.address = {$row.server_address}
 {else}
-account.{$row.line_number}.sip_server_host = {$account.{$row.line_number}.server_address}
+#firmware .160 and newer
+account.{$row.line_number}.sip_server.1.address = {$row.server_address}
+
+#firmware .125 and older
+account.{$row.line_number}.sip_server_host = {$row.server_address} 
 {/if}
 
 account.{$row.line_number}.sip_server_port = {$account.{$row.line_number}.sip_port}
@@ -587,3 +591,5 @@ expansion_module.6.key.{$row.device_key_id}.extension = {$row.device_key_extensi
 expansion_module.6.key.{$row.device_key_id}.label = {$row.device_key_label}
 expansion_module.6.key.{$row.device_key_id}.xml_phonebook =
 {/foreach}
+
+

From abd2077ede9b36532b56aa29260ff435127e5a4d Mon Sep 17 00:00:00 2001
From: FusionPBX <mark@fusionpbx.com>
Date: Sat, 15 Feb 2025 18:21:14 -0700
Subject: [PATCH 22/55] Send CDR with invalid xml to failed/invalid_xml

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

diff --git a/app/xml_cdr/resources/classes/xml_cdr.php b/app/xml_cdr/resources/classes/xml_cdr.php
index f6f5029897..358e1623f9 100644
--- a/app/xml_cdr/resources/classes/xml_cdr.php
+++ b/app/xml_cdr/resources/classes/xml_cdr.php
@@ -352,12 +352,12 @@ if (!class_exists('xml_cdr')) {
 
 					//failed to load the XML, move the XML file to the failed directory
 					if (!empty($xml_cdr_dir)) {
-						if (!file_exists($xml_cdr_dir.'/failed')) {
-							if (!mkdir($xml_cdr_dir.'/failed', 0660, true)) {
+						if (!file_exists($xml_cdr_dir.'/failed/invalid_xml')) {
+							if (!mkdir($xml_cdr_dir.'/failed/invalid_xml', 0660, true)) {
 								die('Failed to create '.$xml_cdr_dir.'/failed');
 							}
 						}
-						rename($xml_cdr_dir.'/'.$this->file, $xml_cdr_dir.'/failed/'.$this->file);
+						rename($xml_cdr_dir.'/'.$this->file, $xml_cdr_dir.'/failed/invalid_xml/'.$this->file);
 					}
 
 					//return without saving the invalid xml

From 8b54dd8b61594935301c8da0bdc87843cdf0d020 Mon Sep 17 00:00:00 2001
From: FusionPBX <mark@fusionpbx.com>
Date: Sat, 15 Feb 2025 18:56:12 -0700
Subject: [PATCH 23/55] Fix invalid XML CDR

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

diff --git a/app/xml_cdr/resources/classes/xml_cdr.php b/app/xml_cdr/resources/classes/xml_cdr.php
index 358e1623f9..90c00cd340 100644
--- a/app/xml_cdr/resources/classes/xml_cdr.php
+++ b/app/xml_cdr/resources/classes/xml_cdr.php
@@ -339,6 +339,9 @@ if (!class_exists('xml_cdr')) {
 			//remove invalid numeric xml tags
 				$xml_string = preg_replace('/<\/?\d+>/', '', $xml_string);
 
+			//replace xml tag name <set api_hangup_hook> with <api_hangup_hook>
+				$xml_string = preg_replace('/(<\/?)(set )([^>]*>)/', '$1$3', $xml_string);
+
 			//disable xml entities
 				if (PHP_VERSION_ID < 80000) { libxml_disable_entity_loader(true); }
 

From 2661ad7bf09494d87bd8a89dfce4b6f8e7432b43 Mon Sep 17 00:00:00 2001
From: FusionPBX <mark@fusionpbx.com>
Date: Mon, 17 Feb 2025 11:56:01 -0700
Subject: [PATCH 24/55] Allow the @ in the Caller ID name

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

diff --git a/app/xml_cdr/resources/classes/xml_cdr.php b/app/xml_cdr/resources/classes/xml_cdr.php
index 90c00cd340..5c14cf3bd5 100644
--- a/app/xml_cdr/resources/classes/xml_cdr.php
+++ b/app/xml_cdr/resources/classes/xml_cdr.php
@@ -648,7 +648,7 @@ if (!class_exists('xml_cdr')) {
 						$domain_uuid = urldecode($xml->variables->domain_uuid);
 
 					//sanitize the caller ID
-						$caller_id_name = preg_replace('#[^a-zA-Z 0-9\-\.\#\*]#', '', $caller_id_name);
+						$caller_id_name = preg_replace('#[^a-zA-Z0-9\-.\#*@ ]#', '', $caller_id_name);
 						$caller_id_number = preg_replace('#[^0-9\-\#\*]#', '', $caller_id_number);
 
 					//misc

From 679b407562db898f71d6cd75d1b5fcec4f999c21 Mon Sep 17 00:00:00 2001
From: frytimo <tim@fusionpbx.com>
Date: Tue, 18 Feb 2025 18:01:19 -0400
Subject: [PATCH 25/55] bug fix domain name when using devices showall (#7259)

When the 'Show All' button is clicked the display of devices is using the current domain name instead of the domain name that belongs to the device
---
 app/devices/devices.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/devices/devices.php b/app/devices/devices.php
index 23dda6fdb2..ec56e1a667 100644
--- a/app/devices/devices.php
+++ b/app/devices/devices.php
@@ -419,7 +419,7 @@
 				echo "	</td>\n";
 			}
 			if (!empty($_GET['show']) && $_GET['show'] == "all" && permission_exists('device_all')) {
-				echo "	<td>".escape($domain_name)."</td>\n";
+				echo "	<td>".escape($row['domain_name'])."</td>\n";
 			}
 			echo "	<td class='no-wrap'>";
 			echo permission_exists('device_edit') ? "<a href='".$list_row_url."'>".escape(format_device_address($row['device_address']))."</a>" : escape(format_device_address($row['device_address']));

From 7503ff40decfd5cb83761195a0d684d510b43efc Mon Sep 17 00:00:00 2001
From: FusionPBX <mark@fusionpbx.com>
Date: Wed, 19 Feb 2025 10:37:40 -0700
Subject: [PATCH 26/55] Add 922 as another emergency test number

---
 app/switch/resources/scripts/app/emergency/index.lua | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/switch/resources/scripts/app/emergency/index.lua b/app/switch/resources/scripts/app/emergency/index.lua
index f3dc40fde8..f4bffd0936 100644
--- a/app/switch/resources/scripts/app/emergency/index.lua
+++ b/app/switch/resources/scripts/app/emergency/index.lua
@@ -192,9 +192,10 @@ end);
 --set event
 if (tonumber(destination_number) == 933) then
 	event = '933 Emergency Address Validation Service';
-else if (tonumber(destination_number) == 911) then
+elseif (tonumber(destination_number) == 922) then
+	event = '922 Emergency Address Validation Service';
+elseif (tonumber(destination_number) == 911) then
 	event = '911 Emergency Call';
-	end
 end
 
 --connect to the database
@@ -261,4 +262,3 @@ end
 
 dbh:query(sql, params);
 dbh:release();
-

From 3c9720ee3606c06d460cbee598781b72d8c8331e Mon Sep 17 00:00:00 2001
From: chansizzle <14916599+chansizzle@users.noreply.github.com>
Date: Thu, 20 Feb 2025 09:13:36 -0700
Subject: [PATCH 27/55] Add CID Name prefix to destinations.php (#7262)

---
 app/destinations/destinations.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/app/destinations/destinations.php b/app/destinations/destinations.php
index 3315a2483a..eabcd61c09 100644
--- a/app/destinations/destinations.php
+++ b/app/destinations/destinations.php
@@ -157,6 +157,7 @@
 		$sql .= "and (";
 		$sql .= "lower(destination_type) like :search ";
 		$sql .= "or lower(destination_number) like :search ";
+		$sql .= "or lower(destination_cid_name_prefix) like :search ";
 		$sql .= "or lower(destination_context) like :search ";
 		$sql .= "or lower(destination_accountcode) like :search ";
 		if (permission_exists('outbound_caller_id_select')) {
@@ -201,6 +202,7 @@
 	$sql .= " d.destination_area_code, ";
 	$sql .= " d.destination_number, ";
 	$sql .= " d.destination_actions, ";
+	$sql .= " d.destination_cid_name_prefix, ";
 	$sql .= " d.destination_context, ";
 	$sql .= " d.destination_caller_id_name, ";
 	$sql .= " d.destination_caller_id_number, ";
@@ -221,6 +223,7 @@
 		$sql .= "and (";
 		$sql .= " lower(destination_type) like :search ";
 		$sql .= " or lower(destination_number) like :search ";
+		$sql .= " or lower(destination_cid_name_prefix) like :search ";
 		$sql .= " or lower(destination_context) like :search ";
 		$sql .= " or lower(destination_accountcode) like :search ";
 		if (permission_exists('outbound_caller_id_select')) {
@@ -350,6 +353,9 @@
 	if (!$show == "all") {
 		echo  "<th>". $text['label-destination_actions']."</th>";
 	}
+	if (permission_exists('destination_cid_name_prefix')) {
+	    echo th_order_by('destination_cid_name_prefix', $text['label-destination_cid_name_prefix'], $order_by, $order, $param);
+	}
 	if (permission_exists("destination_context")) {
 		echo th_order_by('destination_context', $text['label-destination_context'], $order_by, $order, $param);
 	}
@@ -412,6 +418,9 @@
 			if (!$show == "all") {
 				echo "	<td class='overflow' style='min-width: 125px;'>".$row['actions']."&nbsp;</td>\n";
 			}
+			if (permission_exists("destination_cid_name_prefix")) {
+				echo "	<td>".escape($row['destination_cid_name_prefix'])."&nbsp;</td>\n";
+			}
 			if (permission_exists("destination_context")) {
 				echo "	<td>".escape($row['destination_context'])."&nbsp;</td>\n";
 			}

From a18c2edf244040abe630c0e4f044b964178741ad Mon Sep 17 00:00:00 2001
From: wouam31200 <105128426+wouam31200@users.noreply.github.com>
Date: Thu, 20 Feb 2025 17:18:02 +0100
Subject: [PATCH 28/55] Add Yealink W80 Dect (#7258)

* Update {$mac}.cfg

* Update {$mac}.cfg

* Update {$mac}.cfg

BLF Not Showing Correct Status When Using DNS-SRV

* Update y000000000095.cfg

 yealink_language

* Update y000000000097.cfg

Add {$yealink_enhanced_dss_keys}

* Update y000000000096.cfg

Add {$yealink_enhanced_dss_keys}

* Update y000000000095.cfg

Add {$yealink_enhanced_dss_keys}

* Update y000000000070.cfg

Add {$yealink_enhanced_dss_keys}

* Add features.enhanced_dss_keys.enable = {$yealink_enhanced_dss_keys}

* Add features.enhanced_dss_keys.enable = {$yealink_enhanced_dss_keys}

* Added some default settings

Added some default settings

* Update y000000000146.cfg

* add w80 dect
---
 .../provision/yealink/w80/directory.xml       |  91 ++
 .../yealink/w80/favorite_setting.xml          |   8 +
 .../provision/yealink/w80/y000000000000.boot  |   9 +
 .../provision/yealink/w80/y000000000175.cfg   | 922 ++++++++++++++++++
 .../provision/yealink/w80/{$mac}.cfg          | 297 ++++++
 5 files changed, 1327 insertions(+)
 create mode 100644 resources/templates/provision/yealink/w80/directory.xml
 create mode 100644 resources/templates/provision/yealink/w80/favorite_setting.xml
 create mode 100644 resources/templates/provision/yealink/w80/y000000000000.boot
 create mode 100644 resources/templates/provision/yealink/w80/y000000000175.cfg
 create mode 100644 resources/templates/provision/yealink/w80/{$mac}.cfg

diff --git a/resources/templates/provision/yealink/w80/directory.xml b/resources/templates/provision/yealink/w80/directory.xml
new file mode 100644
index 0000000000..86c7b6f8b5
--- /dev/null
+++ b/resources/templates/provision/yealink/w80/directory.xml
@@ -0,0 +1,91 @@
+<YealinkIPPhoneDirectory>
+{foreach $contacts as $row}
+{if $smarty.get.contacts == "users" && $row.category == "users"}
+<DirectoryEntry>
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
+{/if}
+{foreach $row.numbers as $number}
+{if $number.phone_number}
+	<Telephone>{$number.phone_number}</Telephone>
+{else}
+	<Telephone>{$number.phone_extension}</Telephone>
+{/if}
+{/foreach}
+</DirectoryEntry>
+{elseif $smarty.get.contacts == "groups" && $row.category == "groups"}
+<DirectoryEntry>
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
+{/if}
+{foreach $row.numbers as $number}
+{if $number.phone_number}
+	<Telephone>{$number.phone_number}</Telephone>
+{else}
+	<Telephone>{$number.phone_extension}</Telephone>
+{/if}
+{/foreach}
+</DirectoryEntry>
+{elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
+<DirectoryEntry>
+{if $row.contact_name_given}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{else}
+	<Name>{$row.effective_caller_id_name}</Name>
+{/if}
+{if $row.phone_number}
+	<Telephone>{$row.phone_number}</Telephone>
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
+{/if}
+</DirectoryEntry>
+{elseif $smarty.get.contacts == "all"}
+<DirectoryEntry>
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
+{/if}
+{if isset($row.numbers)}
+{foreach $row.numbers as $number}
+{if $number.phone_number}
+	<Telephone>{$number.phone_number}</Telephone>
+{else}
+	<Telephone>{$number.phone_extension}</Telephone>
+{/if}
+{/foreach}
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
+{/if}
+</DirectoryEntry>
+{/if}
+{/foreach}
+</YealinkIPPhoneDirectory>
diff --git a/resources/templates/provision/yealink/w80/favorite_setting.xml b/resources/templates/provision/yealink/w80/favorite_setting.xml
new file mode 100644
index 0000000000..ba7275358e
--- /dev/null
+++ b/resources/templates/provision/yealink/w80/favorite_setting.xml
@@ -0,0 +1,8 @@
+<root_favorite_set>
+<item id_name="localdirectory" display_name="Local Directory" priority="2" enable="0" />
+<item id_name="history" display_name="History" priority="3" enable="1" />
+<item id_name="networkcalllog" display_name="Network CallLog" priority="4" enable="0" />
+<item id_name="remotedirectory" display_name="Remote Phone Book" priority="5" enable="1" />
+<item id_name="ldap" display_name="LDAP" priority="1" enable="0" />
+<item id_name="networkdirectory" display_name="Network Directory" priority="6" enable="0" />
+</root_favorite_set>
diff --git a/resources/templates/provision/yealink/w80/y000000000000.boot b/resources/templates/provision/yealink/w80/y000000000000.boot
new file mode 100644
index 0000000000..9c21b8e4b2
--- /dev/null
+++ b/resources/templates/provision/yealink/w80/y000000000000.boot
@@ -0,0 +1,9 @@
+#!version:1.0.0.1
+## The header above must appear as-is in the first line
+     
+#include:config <xxx.cfg>
+include:config "y000000000175"
+include:config "{$mac}.cfg"
+     
+#overwrite_mode = 1
+overwrite_mode = {$yealink_overwrite_mode}
\ No newline at end of file
diff --git a/resources/templates/provision/yealink/w80/y000000000175.cfg b/resources/templates/provision/yealink/w80/y000000000175.cfg
new file mode 100644
index 0000000000..4cec6c0fe4
--- /dev/null
+++ b/resources/templates/provision/yealink/w80/y000000000175.cfg
@@ -0,0 +1,922 @@
+#!version:1.0.0.1
+
+##File header "#!version:1.0.0.1" can not be edited or deleted.##
+
+#######################################################################################
+##                                   Network                                         ## 
+#######################################################################################
+static.network.internet_port.type =    
+static.network.internet_port.ip = 
+static.network.internet_port.mask = 
+static.network.internet_port.gateway = 
+static.network.static_dns_enable = 1{else}static.network.static_dns_enable = 0{/if}
+static.network.primary_dns = {$dns_server_primary}
+static.network.secondary_dns = {$dns_server_secondary}
+
+static.network.static_nat.enable = {if isset($yealink_static_nat)}1{else}0{/if}
+static.network.static_nat.addr = {$yealink_static_nat}
+static.ice.enable =
+static.sip.nat_stun.enable =
+static.sip.nat_stun.port = {if isset($stun_port)}{$stun_port}{else}3478{/if}
+static.sip.nat_stun.server =
+static.sip.nat_turn.enable =
+static.sip.nat_turn.server =
+static.sip.nat_turn.port =
+static.sip.nat_turn.username =
+static.sip.nat_turn.password =
+
+static.network.lldp.enable = {$yealink_lldp_enable}
+static.network.lldp.packet_interval = {$yealink_lldp_packet_interval}
+
+static.network.cdp.enable = {$yealink_cdp_enable}
+static.network.cdp.packet_interval = {$yealink_cdp_packet_interval}
+
+
+static.network.vlan.internet_port_enable = {$yealink_vlan_enable}
+static.network.vlan.internet_port_vid = {$yealink_vlan_id}
+static.network.vlan.internet_port_priority = {$yealink_vlan_cos}
+static.network.vlan.dhcp_enable = 
+static.network.vlan.dhcp_option =      
+static.network.vlan.vlan_change.enable =
+
+static.network.qos.audiotos =
+static.network.qos.signaltos =
+
+static.network.port.max_rtpport = 
+static.network.port.min_rtpport = 
+  
+static.wui.http_enable =   
+static.wui.https_enable = 
+static.network.port.http = 
+static.network.port.https = 
+
+static.network.802_1x.mode = 
+static.network.802_1x.eap_fast_provision_mode =
+static.network.802_1x.anonymous_identity =
+static.network.802_1x.identity = 
+static.network.802_1x.md5_password = 
+static.network.802_1x.root_cert_url =
+static.network.802_1x.client_cert_url = 
+
+sip.reg_surge_prevention = 
+
+#######################################################################################
+##                                   OpenVPN                                         ##                                            
+#######################################################################################
+static.network.vpn_enable = {$yealink_network_vpn_enable}
+static.openvpn.url = {$yealink_openvpn_url}
+
+#######################################################################################
+##                               Network Other                                       ##       
+#######################################################################################
+static.network.dhcp_host_name =
+static.network.dhcp.option60type =
+static.network.attempt_expired_time = 
+static.network.mtu_value =
+
+
+#######################################################################################
+##                                       Features                                    ##
+#######################################################################################
+call_waiting.enable = {$yealink_call_waiting}
+call_waiting.tone = {$yealink_call_waiting_tone}
+call_waiting.off_code =
+call_waiting.on_code =
+call_waiting.mode =
+
+features.key_as_send =
+sip.use_23_as_pound = 
+features.busy_tone_delay = 
+
+features.normal_refuse_code = 
+features.dnd_refuse_code = 
+
+sip.rfc2543_hold = {$yealink_rfc2543_hold}
+
+#Enable or disable the phone to keep sending the SIP messages to the outbound server; 0-Disabled, 1-Enabled (default);
+sip.use_out_bound_in_dialog = 
+
+#Enable or disable the phone to deal the 180 SIP message after the 183 SIP message; 0-Disabled, 1-Enabled (default);
+phone_setting.is_deal180 = 
+
+#Enable or disable the phone to save the call history; 0-Disabled, 1-Enabled (default);  
+features.save_call_history = 
+
+#######################################################################################
+##                                            DTMF                                   ##          
+#######################################################################################
+features.dtmf.hide = {$yealink_dtmf_hide}
+features.dtmf.hide_delay = 
+features.dtmf.duration =
+features.dtmf.volume =
+features.dtmf.repetition =
+
+forward.international.enable =
+
+features.fwd_diversion_enable =
+
+#Configure the overtime (in minutes) of logging web user interface. It ranges from 1 to 1000, the default value is 5.
+features.relog_offtime = 
+features.call_num_filter = 
+sip.trust_ctrl = {$yealink_trust_ctrl}
+features.voice_mail_tone_enable =
+features.voice_mail_alert.enable =
+features.reboot_in_talk_enable = 
+features.caller_name_type_on_dialing =
+phone_setting.end_call_on_hook.enable =
+base.active_handset.number =
+
+features.call.dialtone_time_out =
+##v81 Add
+features.ringer_device.is_use_headset = {$yealink_headset_ringer}
+features.rtp_symmetric.enable =
+
+
+#######################################################################################
+##                                     Transfer                                      ##          
+#######################################################################################
+#Enable or disable the transferee to display the missed call prompt when receiving a semi_attended transfer call;
+#0-Disabled, 1-Enabled (default);
+transfer.semi_attend_tran_enable = {$yealink_transfer_semi_attended}
+
+#Enable or disable the phone to complete the blind or attended transfer through on-hook;
+#0-Disabled (default), 1-Enabled;
+transfer.blind_tran_on_hook_enable = {$yealink_transfer_blind_on_hook}
+transfer.on_hook_trans_enable = {$yealink_transfer_onhook}
+
+
+#######################################################################################
+##                                    Phone Lock                                     ##          
+#######################################################################################
+phone_setting.emergency.number = {$yealink_emergency_number}
+
+#######################################################################################
+##                                   Power Led Settings                              ##       
+#######################################################################################
+phone_setting.common_power_led_enable =
+phone_setting.ring_power_led_flash_enable =
+phone_setting.mail_power_led_flash_enable = 1
+phone_setting.missed_call_power_led_flash.enable = {$yealink_missed_call_power_led_flash_enable}
+
+#######################################################################################
+##                                   Watch Dog                                       ##       
+#######################################################################################
+static.watch_dog.enable =
+
+#######################################################################################
+##                                   Time&Date                                       ##
+#######################################################################################
+local_time.dhcp_time = {$yealink_dhcp_time}
+local_time.manual_time_enable = 
+local_time.time_zone = {$yealink_time_zone}
+local_time.time_zone_name = {$yealink_time_zone_name}
+local_time.summer_time = {$yealink_summer_time}
+local_time.dst_time_type = {$yealink_dst_type}
+local_time.start_time = {$yealink_time_zone_start_time}
+local_time.end_time = {$yealink_time_zone_end_time}
+local_time.offset_time = {$yealink_offset_time}
+local_time.manual_ntp_srv_prior =
+local_time.ntp_server1 = {$ntp_server_primary}
+local_time.ntp_server2 = {$ntp_server_secondary}
+local_time.interval = {$yealink_time_update}
+local_time.time_format = {$yealink_time_format}
+local_time.date_format = {$yealink_date_format}
+lcl.datetime.date.format = 
+auto_dst.url = {$yealink_auto_dst_url}
+
+#######################################################################################
+##                                   Call Display                                    ##       
+#######################################################################################
+phone_setting.called_party_info_display.enable =
+phone_setting.call_info_display_method = {$yealink_call_info_display_method}
+
+#######################################################################################
+##                                   Base_Upgrade                                    ##                                 
+#######################################################################################
+static.firmware.url = {$yealink_firmware_url}/{$yealink_firmware_w80}
+
+#######################################################################################
+##                                  Handset_upgrade                                  ##
+#######################################################################################
+over_the_air.url =
+over_the_air.url.w53h = {$yealink_firmware_url}/{$yealink_w53h_handset_firmware_url}
+over_the_air.url.w56h = {$yealink_firmware_url}/{$yealink_w56h_handset_firmware_url}
+over_the_air.url.cp930w = {$yealink_firmware_url}/{$yealink_cp930w_firmware_url}
+over_the_air.url.cp935w = {$yealink_firmware_url}/{$yealink_cp935w_firmware_url}
+over_the_air.url.t41s_dd10k = {$yealink_firmware_url}/{$yealink_t41s_dd10k_firmware_url}
+over_the_air.url.w59r = {$yealink_firmware_url}/{$yealink_w59r_handset_firmware_url}
+over_the_air.url.w57r = {$yealink_firmware_url}/{$yealink_w57r_handset_firmware_url}
+over_the_air.url.w73h = {$yealink_firmware_url}/{$yealink_w73h_handset_firmware_url}
+over_the_air.url.w78h = {$yealink_firmware_url}/{$yealink_w78h_handset_firmware_url}
+over_the_air.base_trigger = 1
+over_the_air.handset_trigger =
+over_the_air.handset_tip = 1
+#W80B ADD
+over_the_air.mode = {$yealink_over_the_air_mode}
+
+#######################################################################################
+##                                   Auto Provisioning                               ##      
+#######################################################################################
+
+#Enable or disable the Plug and Play feature; 0-Disabled, 1-Enabled(default);
+static.auto_provision.pnp_enable = 
+
+#Enable or disable the DHCP option mode; 0-Disabled, 1-Enabled (default); 
+static.auto_provision.dhcp_option.enable = 
+
+#Configure the custom DHCP option number. It ranges from 128 to 254. 
+static.auto_provision.dhcp_option.list_user_options = 
+
+#Configure the value (manufacturer of the device) of DHCP option 60.  
+static.auto_provision.dhcp_option.option60_value = 
+
+#Configure the URL of the auto provisioning server.
+static.auto_provision.server.url = {$yealink_provision_url}
+
+#Configure the username and password for downloading.
+static.auto_provision.server.username = {$http_auth_username}
+static.auto_provision.server.password = {$http_auth_password}
+
+static.auto_provision.attempt_expired_time =
+
+#Configure AES key (16 characters) for decrypting the common CFG file.  
+static.auto_provision.aes_key_16.com =
+ 
+#Configure AES key (16 characters) for decrypting the MAC-Oriented CFG file.
+static.auto_provision.aes_key_16.mac =
+
+#Enable or disable the phone to check new configuration when powered on; 0-Disabled, 1-Enabled (default);  
+static.auto_provision.power_on = {$yealink_autop_power_on}
+
+#Enable or disable the phone to check the new configuration repeatedly; 0-Disabled (default), 1-Enabled;
+static.auto_provision.repeat.enable = {$yealink_autop_repeat_enable}
+
+#Configure the interval (in minutes) the phone repeatedly checks the new configuration. The default is 1440.
+static.auto_provision.repeat.minutes = {$yealink_autop_repeat_minutes}
+
+#Enable or disable the phone to check the new configuration weekly; 0-Disabled (default), 1-Enabled;
+static.auto_provision.weekly.enable = {$yealink_autop_weekly_enable}
+
+static.auto_provision.weekly_upgrade_interval = {$yealink_autop_weekly_interval}
+static.auto_provision.inactivity_time_expire =
+
+#Configure the week time the phone checks the new configuration. Applicable when the auto provisioning mode is configured as weekly or power on + weekly.
+static.auto_provision.weekly.begin_time = {$yealink_autop_weekly_begin_time}
+static.auto_provision.weekly.end_time = {$yealink_autop_weekly_end_time}
+static.auto_provision.weekly.dayofweek = {$yealink_autop_weekly_dayofweek}
+
+static.auto_provision.flexible.enable =
+static.auto_provision.flexible.interval=
+static.auto_provision.flexible.begin_time  = 
+static.auto_provision.flexible.end_time =
+
+static.auto_provision.aes_key_in_file =
+static.auto_provision.encryption.config =
+
+static.auto_provision.url_wildcard.pn =
+static.auto_provision.reboot_force.enable =
+
+static.auto_provision.custom.protect =
+static.auto_provision.local_log.backup.enable =
+static.auto_provision.local_log.backup.path =
+static.auto_provision.local_log.backup.upload_period =
+static.auto_provision.local_log.backup.append =
+static.auto_provision.local_log.backup.append.limit_mode =
+static.auto_provision.local_log.backup.append.max_file_size =
+static.auto_provision.local_log.backup.bootlog.upload_wait_time =
+static.auto_provision.attempt_before_failed =
+static.auto_provision.retry_delay_after_file_transfer_failed = 
+static.auto_provision.custom.sync = 
+static.auto_provision.custom.sync.path =
+static.auto_provision.custom.upload_method = 
+static.auto_provision.server.type =
+static.auto_provision.user_agent_mac.enable =
+static.auto_provision.update_file_mode =
+static.auto_provision.dns_resolv_nosys =
+static.auto_provision.dns_resolv_nretry =
+static.auto_provision.dns_resolv_timeout =
+
+#######################################################################################
+##                               All Base Diagnostics                                ##          
+#######################################################################################
+static.diagnose.server.port =
+static.diagnose.server.username = 
+static.diagnose.server.url = 
+static.diagnose.server.password = 
+static.diagnose.type = 
+static.diagnose.pcap.max_size = 
+static.diagnose.log.max_size = 
+
+
+#######################################################################################
+##                                      log Setting                                  ##          
+#######################################################################################
+static.local_log.enable =
+static.local_log.level =
+static.local_log.max_file_size =
+
+static.syslog.enable =
+static.syslog.server =
+static.syslog.server_port =
+static.syslog.transport_type =
+static.syslog.level =
+static.syslog.facility =
+static.syslog.prepend_mac_address.enable =
+
+
+#######################################################################################
+##                                   Dial Plan                                       ##
+#######################################################################################
+#Configure the replace rule. X ranges from 1 to 10;
+#dialplan.replace.prefix.x = 
+#dialplan.replace.replace.x =
+#dialplan.replace.line_id.x =
+dialplan.replace.prefix.1 = 
+dialplan.replace.replace.1 = 
+dialplan.replace.line_id.1 =
+dialplan_replace_rule.url = 
+
+###X ranges from 1 to 20
+###dialplan.dialnow.rule.X = 
+###dialplan.dialnow.line_id.X =
+dialplan.dialnow.rule.1 = {$yealink_dialplan_dialnow_rule_1}
+dialplan.dialnow.line_id.1 = 
+phone_setting.dialnow_delay = {$yealink_dialplan_dialnow_delay}
+dialplan_dialnow.url = 
+
+#Configure the area code.
+dialplan.area_code.code = 
+dialplan.area_code.min_len = 
+dialplan.area_code.max_len = 
+
+#When applying the rule to multiple lines, each line ID separated by comma.
+#e.g. dialplan.area_code.line_id = 1, 2, 3
+dialplan.area_code.line_id = 
+
+#Configure the block out number. X ranges from 1 to 10.
+#dialplan.block_out.number.x =
+dialplan.block_out.number.1 =
+
+#When applying the rule to multiple lines, each line ID separated by comma, e.g. 1,2,3.
+#dialplan.block_out.line_id.x =
+dialplan.block_out.line_id.1 =
+
+dialplan.emergency.enable = 
+dialplan.emergency.asserted_id_source =
+dialplan.emergency.custom_asserted_id =
+dialplan.emergency.server.1.address =
+dialplan.emergency.server.1.port =
+dialplan.emergency.server.1.transport_type =
+dialplan.emergency.1.value =
+dialplan.emergency.1.server_priority =
+
+#######################################################################################
+##                                   Echo Cancellation                               ##          
+#######################################################################################
+voice.vad = {$yealink_voice_vad}
+voice.cng = {$yealink_voice_cng}
+
+#######################################################################################
+##                                   Jitter Buffer                                   ##          
+#######################################################################################
+voice.jib.adaptive = {$yealink_jib_adaptive}
+voice.jib.min = {$yealink_jib_min}
+voice.jib.max = {$yealink_jib_max}
+voice.jib.normal = {$yealink_jib_normal}
+
+#######################################################################################
+##                                   Tone                                            ##                                            
+#######################################################################################
+voice.tone.country = {$yealink_voice_tone_country}
+voice.tone.dial = 
+voice.tone.ring = 
+voice.tone.busy = 
+voice.tone.callwaiting =  
+
+#######################################################################################
+##                                   TR069                                           ##
+#######################################################################################
+#The TR069 feature is only applicable to some designated firmware version.
+#All settings of TR069 require reboot.
+#Enable or disable the TR069 feature; 0-Disabled (default), 1-Enabled;
+static.managementserver.enable = 
+static.managementserver.username = 
+static.managementserver.password = 
+static.managementserver.url = 
+static.managementserver.periodic_inform_enable = 
+static.managementserver.periodic_inform_interval = 
+static.managementserver.connection_request_username = 
+static.managementserver.connection_request_password = 
+
+
+#######################################################################################
+##                                   SIP Advanced                                    ##       
+#######################################################################################
+sip.timer_t1 =
+sip.timer_t2 =
+sip.timer_t4 =
+sip.listen_port = {$yealink_sip_listen_port}
+sip.tls_listen_port =
+sip.disp_incall_to_info =
+###DECT V83 Add
+sip.request_validation.source.list =
+sip.request_validation.digest.list =
+sip.request_validation.event =
+sip.request_validation.digest.realm =
+sip.send_response_by_request = 
+sip.notify_reboot_enable = 
+sip.requesturi.e164.addglobalprefix =
+sip.cid_source.preference =
+sip.mac_in_ua =
+
+#######################################################################################
+##                                   Contacts                                        ##                                            
+#######################################################################################
+#Configure phonebook of HandsetX. X ranges from 1 to 100.
+handset.1.contact_list.url = 
+
+###DECT V83 Add Shared Directory
+static.directory_setting.shared_contact.enable =
+shared_contact_list.url =
+
+#######################################################################################
+##                               Romote Phonebook                                    ##                                            
+#######################################################################################
+#Configure the access URL and dispaly name of the remote phonebook. X ranges from 1 to 5.
+remote_phonebook.data.1.url = {$yealink_remote_phonebook_1_url}
+remote_phonebook.data.1.name = {$yealink_remote_phonebook_1_name}
+remote_phonebook.display_name = 
+
+features.remote_phonebook.enable = {$yealink_remote_phonebook_enable}
+features.remote_phonebook.flash_time =
+
+#######################################################################################
+##                                   LDAP                                            ##
+#######################################################################################
+##It enables or disables LDAP feature.0-Disabled,1-Enabled.
+##The default value is 0.
+ldap.enable = {$ldap_enable}
+
+ldap.customize_label =
+
+##It configures the criteria for searching the contact name attributes.
+##The default value is blank.
+ldap.name_filter = {$ldap_name_filter}
+
+##It configures the criteria for searching the contact number attributes.
+##The default value is blank.
+ldap.number_filter = {$ldap_number_filter}
+
+##The default value is 0,value of 0 to 2, respectively the ldap, ldap + StarTLS and ldaps
+ldap.tls_mode = 
+
+##It configures the IP address or domain name of the LDAP server.
+##The default value is blank.
+ldap.host = {$ldap_host}
+
+##It configures the port of the LDAP server.
+##The default value is 389.Integer from 1 to 65535.
+ldap.port = {$ldap_port}
+
+##It configures the LDAP search base which corresponds to the location of the LDAP phonebook.
+##Example:ldap.base = dc=yealink,dc=cn.
+##The default value is blank.
+ldap.base = {$ldap_base}
+ 
+##It configures the user name for accessing the LDAP server.
+##The default value is blank.
+ldap.user = {$ldap_user}
+
+##It configures the password for accessing the LDAP server.
+##The default value is blank.
+ldap.password = {$ldap_password}
+
+##It configures the maximum of the search results returned by the LDAP server to be displayed.
+##The default value is 50.Integer from 1 to 32000.
+ldap.max_hits = {$ldap_max_hits}
+
+##It configures the name attributes of each record to be returned by the LDAP server.
+##Multiple attributes are separated by spaces.Example:ldap.name_attr =sn cn.
+##The default value is blank.
+ldap.name_attr = {$ldap_name_attr}
+
+##It configures the number attributes of each record to be returned by the LDAP server.
+##Multiple attributes are separated by spaces.Example:ldap.numb_attr = Mobile ipPhone.
+##The default value is blank.
+ldap.numb_attr = {$ldap_numb_attr}
+
+##It configures the display name of the contact record displayed on the LCD screen.
+##The default value is blank.
+ldap.display_name = {$ldap_display_name}
+
+##It configures the LDAP version.
+##The default value is 3.
+ldap.version = {$ldap_version}
+
+##It enables or disables the phone to perform an LDAP search when receiving an incoming call.
+##0-Disabled,1-Enabled.
+##The default value is 0.
+ldap.call_in_lookup = {$ldap_call_in_lookup}
+
+ldap.call_out_lookup = {$ldap_dial_lookup}
+
+##It enables or disables the phone to sort the search results in alphabetical order or numerical order.
+##0-Disabled,1-Enabled.
+##The default value is 0.
+ldap.ldap_sort = {$ldap_sort}
+
+##It is the electricity + start, automatic search + 00 the beginning and the beginning of the numbe
+##The default value is 0.(0-Disable,1-Enable )
+ldap.incoming_call_special_search.enable =
+
+#######################################################################################
+##                                 XML_Phonebook                                     ##
+#######################################################################################
+#X ranges from 1 to 8
+xml_phonebook.data.max_hits = 
+xml_phonebook.data.x.password = 
+xml_phonebook.data.x.username = 
+xml_phonebook.data.x.name = 
+xml_phonebook.data.x.url = 
+
+
+#######################################################################################
+##                                 Super Search                                      ##
+#######################################################################################
+super_search.recent_call = 
+super_search.url = {$yealink_super_search_url}
+search_in_dialing.local_directory.priority = 
+search_in_dialing.local_directory.enable = 
+search_in_dialing.history.priority = 
+search_in_dialing.history.enable = 
+search_in_dialing.remote_phone_book.priority = 
+search_in_dialing.remote_phone_book.enable = 
+search_in_dialing.ldap.priority = 
+search_in_dialing.ldap.enable = 
+search_in_dialing.bw_directory.priority = 
+search_in_dialing.bw_directory.enable = 
+
+
+directory.search_default_input_method =
+directory.search_type =
+
+phone_setting.ringing_timeout = {$yealink_ringing_timeout}
+phone_setting.ringback_timeout =
+
+
+#######################################################################################
+##                                   Security Settings                               ##                   
+#######################################################################################
+#Set the password of the user or the administrator, the value format is: user:password or admin:password;
+#static.security.user_password = admin:admin 
+#static.security.user_password =
+
+#static.security.user_name.user = 
+#static.security.user_name.admin = 
+
+{if isset($user_name) }
+static.security.user_name.user = {$user_name}
+static.security.user_password = {$user_name}:{$user_password}
+{/if}
+
+{if isset($admin_name) }
+static.security.user_name.admin = {$admin_name}
+static.security.user_password = {$admin_name}:{$admin_password}
+{/if}
+
+{if isset($var_name) }
+static.security.user_name.var = {$var_name}
+static.security.user_password = {$var_name}:{$var_password}
+{/if}
+
+
+base.pin_code =
+base.double_pin_code.enable = 
+base.pin_code_for_register =
+wui.quick_login =
+wui.secure_domain_list =
+static.features.custom_factory_config.enable =
+static.security.default_ssl_method = {$yealink_security_default_ssl_method}
+static.security.server_ssl_method = 
+
+
+static.security.var_enable =
+static.web_item_level.url =
+static.security.default_access_level =
+#static.security.user_name.var =
+
+#######################################################################################
+##                                   Certificates                                    ##  
+#######################################################################################
+#Enable or disable the phone to only accept the certificates in the Trusted Certificates list;
+#0-Disabled, 1-Enabled (default);
+static.security.trust_certificates = {$yealink_trust_certificates}
+
+#0-Disabled (default), 1-Enabled;
+static.security.cn_validation =
+
+#0-Default Cert, 1-Custom Cert, 2-All Cert(default);
+static.security.ca_cert = 
+
+static.trusted_certificates.url = 
+#trusted_certificates.delete = http://localhost/all,delete all the trusted certificates; 
+static.trusted_certificates.delete = 
+
+static.security.dev_cert = 
+
+static.server_certificates.url = 
+#server_certificates.delete = http://localhost/all, delete the server certificate; 
+static.server_certificates.delete = 
+
+static.phone_setting.reserve_certs_enable =
+
+#######################################################################################
+##                                   Language Settings                               ##       
+#######################################################################################
+#Specify the web language, the valid values are: English, German, Italian and Turkish;
+#lang.wui = 
+
+wui_lang.delete = 
+wui_lang.url = 
+lang.gui= {$yealink_language_gui}
+lang.wui= {$yealink_language_web}
+
+#######################################################################################
+##                                   Customized Factory Configurations               ##
+#######################################################################################
+#Configure the access URL for downloading the customized factory configurations;
+static.custom_factory_configuration.url = 
+static.configuration.url = 
+
+##It configures the access URL of the custom MAC-Oriented CFG file.
+##The default value is blank.
+static.custom_mac_cfg.url =
+      
+
+
+#######################################################################################
+##                                   Handset                                         ##
+#######################################################################################
+
+static.auto_provision.handset_configured.enable = 
+static.auto_provision.custom.handset.protect =
+
+#custom.handset.language: 0-English, 1-French, 2-German, 3-Italian, 4-Polish, 5-Portuguese, 6-Spanish, 7-Turkish, 8- Russian, 9-Czech (only for CP935W), 10-Swedish, 11-Slovak (only for CP935W)
+custom.handset.language= {$yealink_custom_handset_language}
+
+custom.handset.time_format =
+custom.handset.date_format =   
+custom.handset.screen_saver.enable =
+custom.handset.backlight_in_charger.enable = 
+custom.handset.backlight_out_of_charger.enable =
+custom.handset.keypad_light.enable = 
+custom.handset.keypad_tone.enable =
+custom.handset.confirmation_tone.enable =
+custom.handset.low_battery_tone.enable =
+custom.handset.auto_answer.enable =
+
+custom.handset.defined_left_key.type =
+custom.handset.defined_right_key.type =
+custom.handset.defined_direction_left_key.type =
+custom.handset.defined_direction_right_key.type =
+custom.handset.defined_direction_up_key.type =
+custom.handset.defined_direction_down_key.type =
+custom.handset.defined_left_key.xml_url =
+custom.handset.defined_right_key.xml_url
+custom.handset.defined_direction_left_key.xml_url
+custom.handset.defined_direction_right_key.xml_url
+custom.handset.defined_direction_up_key.xml_url
+custom.handset.defined_direction_down_key.xml_url
+
+#It is only for W56H
+custom.handset.wallpaper =
+
+#######################################################################################
+##                               IPUI Registration                                   ##
+#######################################################################################
+#X ranges from 1 to 100
+#handset.X.reg.enable =
+#handset.X.ipui =
+handset.1.ipui = {$yealink_handset_1_ipui}
+handset.2.ipui = {$yealink_handset_2_ipui}
+handset.3.ipui = {$yealink_handset_3_ipui}
+handset.4.ipui = {$yealink_handset_4_ipui}
+handset.5.ipui = {$yealink_handset_5_ipui}
+handset.6.ipui = {$yealink_handset_6_ipui}
+handset.7.ipui = {$yealink_handset_7_ipui}
+handset.8.ipui = {$yealink_handset_8_ipui}
+handset.9.ipui = {$yealink_handset_9_ipui}
+handset.10.ipui = {$yealink_handset_10_ipui}
+handset.11.ipui = {$yealink_handset_11_ipui}
+handset.12.ipui = {$yealink_handset_12_ipui}
+handset.13.ipui = {$yealink_handset_13_ipui}
+handset.14.ipui = {$yealink_handset_14_ipui}
+handset.15.ipui = {$yealink_handset_15_ipui}
+handset.16.ipui = {$yealink_handset_16_ipui}
+handset.17.ipui = {$yealink_handset_17_ipui}
+handset.18.ipui = {$yealink_handset_18_ipui}
+handset.19.ipui = {$yealink_handset_19_ipui}
+handset.20.ipui = {$yealink_handset_20_ipui}
+handset.21.ipui = {$yealink_handset_21_ipui}
+handset.22.ipui = {$yealink_handset_22_ipui}
+handset.23.ipui = {$yealink_handset_23_ipui}
+handset.24.ipui = {$yealink_handset_24_ipui}
+handset.25.ipui = {$yealink_handset_25_ipui}
+handset.26.ipui = {$yealink_handset_26_ipui}
+handset.27.ipui = {$yealink_handset_27_ipui}
+handset.28.ipui = {$yealink_handset_28_ipui}
+handset.29.ipui = {$yealink_handset_29_ipui}
+handset.30.ipui = {$yealink_handset_30_ipui}
+handset.31.ipui = {$yealink_handset_31_ipui}
+handset.32.ipui = {$yealink_handset_32_ipui}
+handset.33.ipui = {$yealink_handset_33_ipui}
+handset.34.ipui = {$yealink_handset_34_ipui}
+handset.35.ipui = {$yealink_handset_35_ipui}
+handset.36.ipui = {$yealink_handset_36_ipui}
+handset.37.ipui = {$yealink_handset_37_ipui}
+handset.38.ipui = {$yealink_handset_38_ipui}
+handset.39.ipui = {$yealink_handset_39_ipui}
+handset.40.ipui = {$yealink_handset_40_ipui}
+handset.41.ipui = {$yealink_handset_41_ipui}
+handset.42.ipui = {$yealink_handset_42_ipui}
+handset.43.ipui = {$yealink_handset_43_ipui}
+handset.44.ipui = {$yealink_handset_44_ipui}
+handset.45.ipui = {$yealink_handset_45_ipui}
+handset.46.ipui = {$yealink_handset_46_ipui}
+handset.47.ipui = {$yealink_handset_47_ipui}
+handset.48.ipui = {$yealink_handset_48_ipui}
+handset.49.ipui = {$yealink_handset_49_ipui}
+handset.50.ipui = {$yealink_handset_50_ipui}
+handset.51.ipui = {$yealink_handset_51_ipui}
+handset.52.ipui = {$yealink_handset_52_ipui}
+handset.53.ipui = {$yealink_handset_53_ipui}
+handset.54.ipui = {$yealink_handset_54_ipui}
+handset.55.ipui = {$yealink_handset_55_ipui}
+handset.56.ipui = {$yealink_handset_56_ipui}
+handset.57.ipui = {$yealink_handset_57_ipui}
+handset.58.ipui = {$yealink_handset_58_ipui}
+handset.59.ipui = {$yealink_handset_59_ipui}
+handset.60.ipui = {$yealink_handset_60_ipui}
+handset.61.ipui = {$yealink_handset_61_ipui}
+handset.62.ipui = {$yealink_handset_62_ipui}
+handset.63.ipui = {$yealink_handset_63_ipui}
+handset.64.ipui = {$yealink_handset_64_ipui}
+handset.65.ipui = {$yealink_handset_65_ipui}
+handset.66.ipui = {$yealink_handset_66_ipui}
+handset.67.ipui = {$yealink_handset_67_ipui}
+handset.68.ipui = {$yealink_handset_68_ipui}
+handset.69.ipui = {$yealink_handset_69_ipui}
+handset.70.ipui = {$yealink_handset_70_ipui}
+handset.71.ipui = {$yealink_handset_71_ipui}
+handset.72.ipui = {$yealink_handset_72_ipui}
+handset.73.ipui = {$yealink_handset_73_ipui}
+handset.74.ipui = {$yealink_handset_74_ipui}
+handset.75.ipui = {$yealink_handset_75_ipui}
+handset.76.ipui = {$yealink_handset_76_ipui}
+handset.77.ipui = {$yealink_handset_77_ipui}
+handset.78.ipui = {$yealink_handset_78_ipui}
+handset.79.ipui = {$yealink_handset_79_ipui}
+handset.80.ipui = {$yealink_handset_80_ipui}
+handset.81.ipui = {$yealink_handset_81_ipui}
+handset.82.ipui = {$yealink_handset_82_ipui}
+handset.83.ipui = {$yealink_handset_83_ipui}
+handset.84.ipui = {$yealink_handset_84_ipui}
+handset.85.ipui = {$yealink_handset_85_ipui}
+handset.86.ipui = {$yealink_handset_86_ipui}
+handset.87.ipui = {$yealink_handset_87_ipui}
+handset.88.ipui = {$yealink_handset_88_ipui}
+handset.89.ipui = {$yealink_handset_89_ipui}
+handset.90.ipui = {$yealink_handset_90_ipui}
+handset.91.ipui = {$yealink_handset_91_ipui}
+handset.92.ipui = {$yealink_handset_92_ipui}
+handset.93.ipui = {$yealink_handset_93_ipui}
+handset.94.ipui = {$yealink_handset_94_ipui}
+handset.95.ipui = {$yealink_handset_95_ipui}
+handset.96.ipui = {$yealink_handset_96_ipui}
+handset.97.ipui = {$yealink_handset_97_ipui}
+handset.98.ipui = {$yealink_handset_98_ipui}
+handset.99.ipui = {$yealink_handset_99_ipui}
+handset.100.ipui = {$yealink_handset_100_ipui}
+
+
+
+
+
+
+#######################################################################################
+##                           DNS                                                     ##       
+#######################################################################################
+dns_cache_a.1.name =
+dns_cache_a.1.ip = 
+dns_cache_a.1.ttl =
+dns_cache_srv.1.name = 
+dns_cache_srv.1.port =
+dns_cache_srv.1.priority =
+dns_cache_srv.1.target =
+dns_cache_srv.1.weight =
+dns_cache_srv.1.ttl =
+dns_cache_naptr.1.name =
+dns_cache_naptr.1.order =
+dns_cache_naptr.1.preference =
+dns_cache_naptr.1.replace =
+dns_cache_naptr.1.service = 
+dns_cache_naptr.1.ttl =
+
+################################################################
+#                        SIP Backup Server                    ##
+################################################################
+static.network.dns.ttl_enable =
+static.network.dns.last_cache_expired.enable=
+static.network.dns.last_cache_expired =
+static.network.dns.query_timeout =
+static.network.dns.retry_times =
+sip.dns_transport_type =
+sip.skip_redundant_failover_addr =
+
+#V80 Add
+features.barge_in_via_username.enable =
+
+#######################################################################################
+##                                    Other                                          ##       
+#######################################################################################
+features.dnd.allow = {$yealink_dnd_allow}
+features.fwd.allow = {$yealink_fwd_allow}
+phone_setting.disable_account_without_username.enable = 
+phone_setting.end_call_net_disconnect.enable = 
+push_xml.sip_notify = 
+phone_setting.warnings_display.mode =
+
+#######################################################################################
+##                                 Broadsoft Setting                                 ##        
+#######################################################################################
+bw.enable =
+features.feature_key_sync.enable = {$yealink_feature_key_sync}
+bw.xsi.enable =
+sip.authentication_for_xsi =
+
+bw.xsi.call_log.enable =
+bw.xsi.call_log.multiple_accounts.enable =
+
+bw.xsi.directory.enable =
+bw_phonebook.group_enable =
+bw_phonebook.personal_enable =
+bw_phonebook.group_common_enable = 
+bw_phonebook.enterprise_enable = 
+bw_phonebook.enterprise_common_enable = 
+bw_phonebook.group_displayname =
+bw_phonebook.personal_displayname =
+bw_phonebook.group_common_displayname =
+bw_phonebook.enterprise_displayname =
+bw_phonebook.enterprise_common_displayname =
+bw_phonebook.custom =
+directory.update_time_interval = 
+
+#######################################################################################
+##                                   Call Park                                       ##       
+#######################################################################################
+
+features.call_park.enable = 
+features.call_park.group_enable = 
+features.call_park.park_ring =
+features.call_park.park_visual_notify_enable =
+features.call_park.group_park_code =
+features.call_park.park_code =
+features.call_park.park_mode =
+features.call_park.park_retrieve_code =
+
+
+#######################################################################################
+##                                  Base Registration                                ##       
+#######################################################################################
+static.station.mode=
+features.dect_management.ip_address
+
+#* range from 1 to 30
+station.allowed.*.mac=
+station.allowed.*.name=
+station.allowed.*.sync.cluster=
+station.allowed.*.sync.level=
+station.*.name=
+station.*.active=
+station.*.sync.cluster=
+station.*.sync.level=
+station.*.sync.type=
+static.station.*.network.type=
+static.station.*.network.ip=
+static.station.*.network.gateway=
+static.station.*.network.mask=
+
+#* range from 1 to 10
+template.*.name=
+template.*.outbound.*.address=
+template.*.outbound.*.port=
+template.*.outbound.enable=
+template.*.outbound.fallback_interval=
+template.*.sip_server.*.address=
+template.*.sip_server.*.expires=
+template.*.sip_server.*.port=
+template.*.sip_server.*.retry_counts=
+template.*.sip_server.*.transport_type=
+
+#W80B ADD
+features.media_transmit.enable= 
\ No newline at end of file
diff --git a/resources/templates/provision/yealink/w80/{$mac}.cfg b/resources/templates/provision/yealink/w80/{$mac}.cfg
new file mode 100644
index 0000000000..df8be86a45
--- /dev/null
+++ b/resources/templates/provision/yealink/w80/{$mac}.cfg
@@ -0,0 +1,297 @@
+#!version:1.0.0.1
+
+##File header "#!version:1.0.0.1" can not be edited or deleted.##
+
+#Account.X Settings ,X Range from 1 to 100
+
+{foreach $lines as $row}
+
+#######################################################################################
+##                                   Account1 Settings                               ##                                       
+#######################################################################################
+
+#Enable or disable the account; 0-Disabled (default), 1-Enabled;
+#account.{$row.line_number}.enable = 
+
+#Configure the label displayed on the LCD screen.
+account.{$row.line_number}.label = {$row.label}
+
+#Configure the display name.
+account.{$row.line_number}.display_name = {$row.display_name}
+
+#Configure the register user name.
+account.{$row.line_number}.user_name = {$row.user_id}@{$row.server_address}
+
+#Configure the username and password for register authentication.
+account.{$row.line_number}.auth_name = {$row.auth_id}
+account.{$row.line_number}.password = {$row.password}
+
+#W80B ADD
+account.{$row.line_number}.sip_server.template = 
+account.{$row.line_number}.media_transmit.enable = 
+
+#######################################################################################
+##                                  Failback                                         ##       
+#######################################################################################
+account.{$row.line_number}.sip_server.1.failback_mode = 0
+account.{$row.line_number}.sip_server.1.failback_timeout = 3600
+account.{$row.line_number}.sip_server.1.register_on_enable = 0
+account.{$row.line_number}.sip_server.1.failback_subscribe.enable =
+account.{$row.line_number}.sip_server.1.invite_retry_counts =
+account.{$row.line_number}.sip_server.1.only_signal_with_registered =
+
+account.{$row.line_number}.sip_server.2.failback_mode = 
+account.{$row.line_number}.sip_server.2.failback_timeout = 
+account.{$row.line_number}.sip_server.2.register_on_enable = 
+account.{$row.line_number}.sip_server.2.failback_subscribe.enable =
+account.{$row.line_number}.sip_server.2.invite_retry_counts =
+account.{$row.line_number}.sip_server.2.only_signal_with_registered =
+
+account.{$row.line_number}.naptr_build = 
+account.{$row.line_number}.fallback.redundancy_type = 
+account.{$row.line_number}.fallback.timeout = 10
+
+account.{$row.line_number}.dns_cache_type = 
+account.{$row.line_number}.static_cache_pri = 
+
+#######################################################################################
+##                                     Basic                                         ##                                       
+#######################################################################################
+#Enable or disable the anonymous call feature; 0-Disabled (default), 1-Enabled;
+account.{$row.line_number}.anonymous_call = 
+
+#Enable or disable the reject anonymous call feature; 0-Disabled (default), 1-Enabled;
+account.{$row.line_number}.reject_anonymous_call = 
+
+#Configure the on code and off code of the anonymous call feature.
+account.{$row.line_number}.send_anonymous_code =
+account.{$row.line_number}.anonymous_call_oncode = 
+account.{$row.line_number}.anonymous_call_offcode = 
+
+#Configure the on code and off code of the reject anonymous call feature.
+account.{$row.line_number}.send_anonymous_rejection_code =
+account.{$row.line_number}.anonymous_reject_oncode = 
+account.{$row.line_number}.anonymous_reject_offcode = 
+
+
+#######################################################################################
+##                                   Codec                                           ##
+#######################################################################################
+account.{$row.line_number}.codec.g722.enable = {if isset($yealink_codec_g722_enable)}{$yealink_codec_g722_enable}{else}0{/if}
+
+account.{$row.line_number}.codec.g722.priority = {if isset($yealink_codec_g722_priority)}{$yealink_codec_g722_priority}{else}0{/if}
+
+account.{$row.line_number}.codec.g729.enable = {if isset($yealink_codec_g729_enable) && $yealink_codec_g729_enable}1{else}0{/if}
+account.{$row.line_number}.codec.g729.priority = {if isset($yealink_codec_g729_priority)}{$yealink_codec_g729_priority}{else}0{/if}
+
+account.{$row.line_number}.codec.g726_16.enable = {if isset($yealink_codec_g726_16_enable) && $yealink_codec_g726_16_enable}1{else}0{/if}
+account.{$row.line_number}.codec.g726_16.priority = {if isset($yealink_codec_g726_16_priority)}{$yealink_codec_g726_16_priority}{else}0{/if}
+
+account.{$row.line_number}.codec.g726_24.enable = {if isset($yealink_codec_g726_24_enable) && $yealink_codec_g726_24_enable}1{else}0{/if}
+account.{$row.line_number}.codec.g726_24.priority = {if isset($yealink_codec_g726_24_priority)}{$yealink_codec_g726_24_priority}{else}0{/if}
+
+account.{$row.line_number}.codec.g726_32.enable = {if isset($yealink_codec_g726_32_enable) && $yealink_codec_g726_32_enable}1{else}0{/if}
+account.{$row.line_number}.codec.g726_32.priority = {if isset($yealink_codec_g726_32_priority)}{$yealink_codec_g726_32_priority}{else}0{/if}
+
+account.{$row.line_number}.codec.g726_40.enable = {if isset($yealink_codec_g726_40_enable) && $yealink_codec_g726_40_enable}1{else}0{/if}
+account.{$row.line_number}.codec.g726_40.priority = {if isset($yealink_codec_g726_40_priority)}{$yealink_codec_g726_40_priority}{else}0{/if}
+
+account.{$row.line_number}.codec.ilbc.enable = {if isset($yealink_codec_ilbc_enable) && $yealink_codec_ilbc_enable}1{else}0{/if}
+account.{$row.line_number}.codec.ilbc.priority = {if isset($yealink_codec_iLBC_priority)}{$yealink_codec_iLBC_priority}{else}0{/if}
+
+account.{$row.line_number}.codec.pcmu.enable = {if isset($yealink_codec_pcmu_enable) && $yealink_codec_pcmu_enable}1{else}{0}{/if}
+account.{$row.line_number}.codec.pcmu.priority = {if isset($yealink_codec_pcmu_priority)}{$yealink_codec_pcmu_priority}{else}0{/if}
+
+account.{$row.line_number}.codec.pcma.enable = {if isset($yealink_codec_pcma_enable) && $yealink_codec_pcma_enable}1{else}{0}{/if}
+
+account.{$row.line_number}.codec.pcma.priority = {if isset($yealink_codec_pcma_priority)}{$yealink_codec_pcma_priority}{else}0{/if}
+
+
+account.{$row.line_number}.codec.opus.enable = {if isset($yealink_codec_opus_enable) && $yealink_codec_opus_enable}1{else}0{/if}
+account.{$row.line_number}.codec.opus.priority = {if isset($yealink_codec_opus_priority)}{$yealink_codec_opus_priority}{else}0{/if}
+
+#######################################################################################
+##                                   NAT Settings                                    ##
+#######################################################################################
+
+#Enable or disable the NAT traversal; 0-Disabled (default), 1-STUN;
+account.{$row.line_number}.nat.nat_traversal =
+
+#Enable or disable the NAT keep-alive; 0-Disabled, 1-Enabled (default);
+account.{$row.line_number}.nat.udp_update_enable = 3
+
+#Specify the keep-alive interval (in seconds), the default value is 30.
+account.{$row.line_number}.nat.udp_update_time = 30
+
+#Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
+account.{$row.line_number}.nat.rport = {$yealink_rport}
+
+#######################################################################################
+##                           Register Advanced                                       ##       
+#######################################################################################
+
+#Configure the period of BLF subscription(SCA、Call Park)
+account.{$row.line_number}.blf.subscribe_period =
+
+#Configure the DTMF type; 0-INBAND, 1-RFC2833 (default), 2-SIP INFO, 3-AUTO+SIP INFO;
+account.{$row.line_number}.dtmf.type = {$yealink_dtmf_type}
+
+#Configure the RFC2833 payload. It ranges from 96 to 225, the default value is 101.
+account.{$row.line_number}.dtmf.dtmf_payload = 
+
+#Configure the DTMF info type when using the SIP INFO; 0-Disabled, 1-DTMF-Relay (default), 2-DTMF, 3-Telephone-Event;
+account.{$row.line_number}.dtmf.info_type = 
+
+#Enable or disable the 100 reliable retransmission; 0-Disabled, 1-Enabled (default);
+account.{$row.line_number}.100rel_enable = {$yealink_retransmission}
+
+#Enable or disable the phone to subscribe the register status; 0-Disabled (default), 1-Enabled;
+account.{$row.line_number}.subscribe_register =
+
+#Enable or disable the phone to subscribe the message waiting indicator; 0-Disabled (default), 1-Enabled;
+account.{$row.line_number}.subscribe_mwi = 
+
+#Configure MWI subscribe expiry time (in seconds). It ranges from 0 to 84600, the default value is 3600.
+account.{$row.line_number}.subscribe_mwi_expires = 
+
+#Enable or disable the phone to subscribe to the voicemail through the message waiting indicator; 0-Disabled (default), 1-Enabled;
+account.{$row.line_number}.subscribe_mwi_to_vm = 
+
+voice_mail.number.1 = {$voicemail_number}
+
+account.{$row.line_number}.display_mwi.enable = 
+
+#Configure the type of SIP header to carry the caller ID; 0-FROM (default), 1-PAI;
+account.{$row.line_number}.cid_source = {$yealink_cid_source}
+account.{$row.line_number}.cid_source_privacy = 
+account.{$row.line_number}.cid_source_ppi = 
+
+#Enable or disable the session timer; 0-Disabled (default), 1-Enabled;  
+account.{$row.line_number}.session_timer.enable = {$yealink_session_timer}
+
+#Configure the refresh session timer interval (in seconds). It ranges from 1 to 9999.
+account.{$row.line_number}.session_timer.expires =           
+
+#Configure the session timer refresher; 0-Uac (default), 1-Uas;
+account.{$row.line_number}.session_timer.refresher = 
+
+#Enable or disable the "user=phone"; 0-Disabled (default), 1-Enabled;
+account.{$row.line_number}.enable_user_equal_phone = 
+
+#Configure the way of encrypting the message; 0-Disabled (default), 1-Forced, 2-Negotiated;
+account.{$row.line_number}.srtp_encryption = {$yealink_srtp_encryption}
+
+#Configure the RTP packet time. The valid values are 0 (Disabled), 10, 20 (default), 30, 40, 50, 60.
+account.{$row.line_number}.ptime = 20
+
+account.{$row.line_number}.shared_line = {$shared_line_1}
+
+#Enable or disable the phone to send the MAC address in the Register message; 0-Disabled (default), 1-Enabled;    
+account.{$row.line_number}.register_mac =
+
+#Enable or disable the phone to send the line number in the Register message; 0-Disabled, 1-Enabled (default);   
+account.{$row.line_number}.register_line = 
+
+#Configure the interval (in seconds) the phone retries to register when account fails to register. It ranges from 0 to 1800, the default value is 30.
+account.{$row.line_number}.reg_fail_retry_interval = 
+
+account.{$row.line_number}.reg_failed_retry_min_time =
+account.{$row.line_number}.reg_failed_retry_max_time =
+
+#######################################################################################
+##                                   Network Conference                              ##                                       
+#######################################################################################
+account.{$row.line_number}.conf_type = {if $nway_conference == 'true'}2{elseif $nway_conference == 'false'}0{/if}
+account.{$row.line_number}.conf_uri = {if $nway_conference == 'true'}nway{$row.auth_id}@{$row.server_address}{/if}
+
+account.{$row.line_number}.sip_server_type = 
+account.{$row.line_number}.unregister_on_reboot = 1
+
+
+#######################################################################################
+##                           Register Other                                          ##       
+#######################################################################################
+##DECT V81 Add
+account.{$row.line_number}.simultaneous_outgoing.num =
+
+account.{$row.line_number}.register_expires_overlap =
+account.{$row.line_number}.subscribe_expires_overlap =
+account.{$row.line_number}.auto_dial_enable = 
+account.{$row.line_number}.auto_dial_num = 
+account.{$row.line_number}.cp_source = {$yealink_cp_source}
+account.{$row.line_number}.transfer_refer_to_contact_header.enable =
+#V80 Add
+account.{$row.line_number}.custom_ua =
+account.{$row.line_number}.callpark_enable =
+account.{$row.line_number}.check_cseq.enable = 
+account.{$row.line_number}.check_to_tag.enable =
+account.{$row.line_number}.hold_use_inactive = 
+account.{$row.line_number}.line_seize.expires =
+account.{$row.line_number}.update_ack_while_dialing =
+account.{$row.line_number}.sub_fail_retry_interval =
+
+#######################################################################################
+##         	                   Call Forward                                          ##               
+#######################################################################################
+#Enable or disable the always forward, 0-Disabled(default), 1-Enabled;
+account.{$row.line_number}.always_fwd.enable = 
+
+#Configure the target phonenumber that the phone will forward the call to;
+account.{$row.line_number}.always_fwd.target = 
+
+#Configure the on/off code for always forward;
+account.{$row.line_number}.always_fwd.off_code =
+account.{$row.line_number}.always_fwd.on_code =
+
+
+#Enable or disable the busy forward, 0-Disabled(default), 1-Enabled;
+account.{$row.line_number}.busy_fwd.enable =         
+account.{$row.line_number}.busy_fwd.target = 
+
+account.{$row.line_number}.busy_fwd.off_code =
+account.{$row.line_number}.busy_fwd.on_code =
+
+
+#Enable or disable the no answer forward, 0-Disabled(default), 1-Enabled; 
+#Configure the waiting ring times before forwarding, ranges from 0 to 20 (by default);
+account.{$row.line_number}.timeout_fwd.enable = 
+account.{$row.line_number}.timeout_fwd.target =
+account.{$row.line_number}.timeout_fwd.timeout =  
+
+account.{$row.line_number}.timeout_fwd.off_code =
+account.{$row.line_number}.timeout_fwd.on_code = 
+
+#######################################################################################
+##                          DND                                                      ##                                       
+#######################################################################################
+
+#Enable or disable the DND feautre; 0-Disabled (default), 1-Enabled;
+account.{$row.line_number}.dnd.enable = 
+
+#Configure the DND on code and off code.
+account.{$row.line_number}.dnd.on_code = 
+account.{$row.line_number}.dnd.off_code =
+
+#######################################################################################
+##         Broadsoft XSI                                                             ##      
+#######################################################################################
+
+##It configures the user name for XSI authentication.
+##The default value is blank.
+account.{$row.line_number}.xsi.user =  
+
+##It configures the password for XSI authentication.
+##The default value is blank.
+account.{$row.line_number}.xsi.password = 
+
+##It configures the access URL of the Xtended Services Platform server.
+##The default value is blank.
+account.{$row.line_number}.xsi.host = 
+
+##It configures the server type of the Xtended Services Platform server.
+##The default value is http.
+account.{$row.line_number}.xsi.server_type = 
+
+##It configures the server port of the Xtended Services Platform server.
+##The default value is 80.Integer from 1 to 65535
+account.{$row.line_number}.xsi.port = 
\ No newline at end of file

From 83cf1844525c536c20df65394fbdec537974148d Mon Sep 17 00:00:00 2001
From: Mendel <44873735+rabbidiesel@users.noreply.github.com>
Date: Thu, 20 Feb 2025 11:31:10 -0500
Subject: [PATCH 29/55] Yealink provioning files fix (#7236)

* multiple changes to the and for the yealink t58W

Added the variable for Bluetooth so that it won't be disabled every time the phone is provisioned.
Added what is needed for the wallpaper and firmware.

* Update app_config.php

* Added the Call Waiting Variable to the yealink config files
---
 resources/templates/provision/yealink/t19p/y000000000053.cfg | 2 +-
 resources/templates/provision/yealink/t20p/y000000000007.cfg | 2 +-
 resources/templates/provision/yealink/t21p/y000000000052.cfg | 2 +-
 resources/templates/provision/yealink/t22p/y000000000005.cfg | 2 +-
 resources/templates/provision/yealink/t23g/y000000000044.cfg | 2 +-
 resources/templates/provision/yealink/t23p/y000000000044.cfg | 2 +-
 resources/templates/provision/yealink/t26p/y000000000004.cfg | 2 +-
 resources/templates/provision/yealink/t27g/y000000000069.cfg | 2 +-
 resources/templates/provision/yealink/t27p/y000000000045.cfg | 2 +-
 resources/templates/provision/yealink/t28p/y000000000000.cfg | 2 +-
 resources/templates/provision/yealink/t31g/y000000000123.cfg | 2 +-
 resources/templates/provision/yealink/t32g/y000000000032.cfg | 2 +-
 resources/templates/provision/yealink/t33g/y000000000124.cfg | 2 +-
 resources/templates/provision/yealink/t34w/y000000000171.cfg | 2 +-
 resources/templates/provision/yealink/t38g/y000000000038.cfg | 2 +-
 resources/templates/provision/yealink/t40g/y000000000076.cfg | 2 +-
 resources/templates/provision/yealink/t40p/y000000000054.cfg | 2 +-
 resources/templates/provision/yealink/t41p/y000000000036.cfg | 2 +-
 resources/templates/provision/yealink/t41s/y000000000068.cfg | 2 +-
 resources/templates/provision/yealink/t42g/y000000000029.cfg | 2 +-
 resources/templates/provision/yealink/t42s/y000000000067.cfg | 2 +-
 resources/templates/provision/yealink/t42u/y000000000116.cfg | 2 +-
 resources/templates/provision/yealink/t43u/y000000000107.cfg | 2 +-
 resources/templates/provision/yealink/t44w/y000000000174.cfg | 2 +-
 resources/templates/provision/yealink/t46g/y000000000028.cfg | 2 +-
 resources/templates/provision/yealink/t46s/y000000000066.cfg | 2 +-
 resources/templates/provision/yealink/t46u/y000000000108.cfg | 2 +-
 resources/templates/provision/yealink/t48g/y000000000035.cfg | 2 +-
 resources/templates/provision/yealink/t48s/y000000000065.cfg | 2 +-
 resources/templates/provision/yealink/t48u/y000000000109.cfg | 2 +-
 resources/templates/provision/yealink/t49g/y000000000051.cfg | 2 +-
 resources/templates/provision/yealink/t52s/y000000000074.cfg | 2 +-
 resources/templates/provision/yealink/t53/y000000000095.cfg  | 2 +-
 resources/templates/provision/yealink/t53w/y000000000095.cfg | 2 +-
 resources/templates/provision/yealink/t54s/y000000000070.cfg | 2 +-
 resources/templates/provision/yealink/t54w/y000000000096.cfg | 2 +-
 resources/templates/provision/yealink/t56a/y000000000056.cfg | 2 +-
 resources/templates/provision/yealink/t57w/y000000000097.cfg | 2 +-
 resources/templates/provision/yealink/t58a/y000000000058.cfg | 2 +-
 resources/templates/provision/yealink/t58v/y000000000058.cfg | 2 +-
 resources/templates/provision/yealink/t58w/y000000000150.cfg | 2 +-
 resources/templates/provision/yealink/w60b/y000000000077.cfg | 2 +-
 resources/templates/provision/yealink/w70b/y000000000146.cfg | 2 +-
 43 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/resources/templates/provision/yealink/t19p/y000000000053.cfg b/resources/templates/provision/yealink/t19p/y000000000053.cfg
index 93adec6594..48803d0214 100644
--- a/resources/templates/provision/yealink/t19p/y000000000053.cfg
+++ b/resources/templates/provision/yealink/t19p/y000000000053.cfg
@@ -345,7 +345,7 @@ voice.tone.dial =
 voice.tone.ring =
 voice.tone.busy =
 voice.tone.congestion =
-voice.tone.callwaiting =
+voice.tone.callwaiting = {$yealink_voice_tone_callwaiting}
 voice.tone.dialrecall =
 voice.tone.record=
 voice.tone.info =
diff --git a/resources/templates/provision/yealink/t20p/y000000000007.cfg b/resources/templates/provision/yealink/t20p/y000000000007.cfg
index f938d6b117..b69d260aa7 100644
--- a/resources/templates/provision/yealink/t20p/y000000000007.cfg
+++ b/resources/templates/provision/yealink/t20p/y000000000007.cfg
@@ -345,7 +345,7 @@ voice.tone.dial =
 voice.tone.ring =
 voice.tone.busy =
 voice.tone.congestion =
-voice.tone.callwaiting =
+voice.tone.callwaiting = {$yealink_voice_tone_callwaiting}
 voice.tone.dialrecall =
 voice.tone.record=
 voice.tone.info =
diff --git a/resources/templates/provision/yealink/t21p/y000000000052.cfg b/resources/templates/provision/yealink/t21p/y000000000052.cfg
index 6d91512935..01e9623a7f 100644
--- a/resources/templates/provision/yealink/t21p/y000000000052.cfg
+++ b/resources/templates/provision/yealink/t21p/y000000000052.cfg
@@ -348,7 +348,7 @@ voice.tone.dial =
 voice.tone.ring =
 voice.tone.busy =
 voice.tone.congestion =
-voice.tone.callwaiting =
+voice.tone.callwaiting = {$yealink_voice_tone_callwaiting}
 voice.tone.dialrecall =
 voice.tone.record=
 voice.tone.info =
diff --git a/resources/templates/provision/yealink/t22p/y000000000005.cfg b/resources/templates/provision/yealink/t22p/y000000000005.cfg
index 86489cb925..5dda16ef66 100644
--- a/resources/templates/provision/yealink/t22p/y000000000005.cfg
+++ b/resources/templates/provision/yealink/t22p/y000000000005.cfg
@@ -345,7 +345,7 @@ voice.tone.dial =
 voice.tone.ring =
 voice.tone.busy =
 voice.tone.congestion =
-voice.tone.callwaiting =
+voice.tone.callwaiting = {$yealink_voice_tone_callwaiting}
 voice.tone.dialrecall =
 voice.tone.record=
 voice.tone.info =
diff --git a/resources/templates/provision/yealink/t23g/y000000000044.cfg b/resources/templates/provision/yealink/t23g/y000000000044.cfg
index 1eb3657b27..a8e323982a 100644
--- a/resources/templates/provision/yealink/t23g/y000000000044.cfg
+++ b/resources/templates/provision/yealink/t23g/y000000000044.cfg
@@ -388,7 +388,7 @@ voice.tone.dial =
 voice.tone.ring =
 voice.tone.busy =
 voice.tone.congestion =
-voice.tone.callwaiting =
+voice.tone.callwaiting = {$yealink_voice_tone_callwaiting}
 voice.tone.dialrecall =
 voice.tone.record=
 voice.tone.info =
diff --git a/resources/templates/provision/yealink/t23p/y000000000044.cfg b/resources/templates/provision/yealink/t23p/y000000000044.cfg
index e739493964..31e2843ed9 100644
--- a/resources/templates/provision/yealink/t23p/y000000000044.cfg
+++ b/resources/templates/provision/yealink/t23p/y000000000044.cfg
@@ -388,7 +388,7 @@ voice.tone.dial =
 voice.tone.ring =
 voice.tone.busy =
 voice.tone.congestion =
-voice.tone.callwaiting =
+voice.tone.callwaiting = {$yealink_voice_tone_callwaiting}
 voice.tone.dialrecall =
 voice.tone.record=
 voice.tone.info =
diff --git a/resources/templates/provision/yealink/t26p/y000000000004.cfg b/resources/templates/provision/yealink/t26p/y000000000004.cfg
index 5594ea9d5c..a81c89353a 100644
--- a/resources/templates/provision/yealink/t26p/y000000000004.cfg
+++ b/resources/templates/provision/yealink/t26p/y000000000004.cfg
@@ -345,7 +345,7 @@ voice.tone.dial =
 voice.tone.ring =
 voice.tone.busy =
 voice.tone.congestion =
-voice.tone.callwaiting =
+voice.tone.callwaiting = {$yealink_voice_tone_callwaiting}
 voice.tone.dialrecall =
 voice.tone.record=
 voice.tone.info =
diff --git a/resources/templates/provision/yealink/t27g/y000000000069.cfg b/resources/templates/provision/yealink/t27g/y000000000069.cfg
index 25d9a79260..9eac3dcf25 100644
--- a/resources/templates/provision/yealink/t27g/y000000000069.cfg
+++ b/resources/templates/provision/yealink/t27g/y000000000069.cfg
@@ -415,7 +415,7 @@ voice.tone.dial =
 voice.tone.ring =
 voice.tone.busy =
 voice.tone.congestion =
-voice.tone.callwaiting =
+voice.tone.callwaiting = {$yealink_voice_tone_callwaiting}
 voice.tone.dialrecall =
 voice.tone.record=
 voice.tone.info =
diff --git a/resources/templates/provision/yealink/t27p/y000000000045.cfg b/resources/templates/provision/yealink/t27p/y000000000045.cfg
index aa949f73c0..3ba6d69310 100644
--- a/resources/templates/provision/yealink/t27p/y000000000045.cfg
+++ b/resources/templates/provision/yealink/t27p/y000000000045.cfg
@@ -388,7 +388,7 @@ voice.tone.dial =
 voice.tone.ring =
 voice.tone.busy =
 voice.tone.congestion =
-voice.tone.callwaiting =
+voice.tone.callwaiting = {$yealink_voice_tone_callwaiting}
 voice.tone.dialrecall =
 voice.tone.record=
 voice.tone.info =
diff --git a/resources/templates/provision/yealink/t28p/y000000000000.cfg b/resources/templates/provision/yealink/t28p/y000000000000.cfg
index 957b4b14a4..e551d48541 100644
--- a/resources/templates/provision/yealink/t28p/y000000000000.cfg
+++ b/resources/templates/provision/yealink/t28p/y000000000000.cfg
@@ -345,7 +345,7 @@ voice.tone.dial =
 voice.tone.ring =
 voice.tone.busy =
 voice.tone.congestion =
-voice.tone.callwaiting =
+voice.tone.callwaiting = {$yealink_voice_tone_callwaiting}
 voice.tone.dialrecall =
 voice.tone.record=
 voice.tone.info =
diff --git a/resources/templates/provision/yealink/t31g/y000000000123.cfg b/resources/templates/provision/yealink/t31g/y000000000123.cfg
index 2be6e5b330..e8d856cbaf 100644
--- a/resources/templates/provision/yealink/t31g/y000000000123.cfg
+++ b/resources/templates/provision/yealink/t31g/y000000000123.cfg
@@ -345,7 +345,7 @@ voice.tone.dial =
 voice.tone.ring =
 voice.tone.busy =
 voice.tone.congestion =
-voice.tone.callwaiting =
+voice.tone.callwaiting = {$yealink_voice_tone_callwaiting}
 voice.tone.dialrecall =
 voice.tone.record=
 voice.tone.info =
diff --git a/resources/templates/provision/yealink/t32g/y000000000032.cfg b/resources/templates/provision/yealink/t32g/y000000000032.cfg
index 4de4d68f80..1bae73dae1 100644
--- a/resources/templates/provision/yealink/t32g/y000000000032.cfg
+++ b/resources/templates/provision/yealink/t32g/y000000000032.cfg
@@ -345,7 +345,7 @@ voice.tone.dial =
 voice.tone.ring =
 voice.tone.busy =
 voice.tone.congestion =
-voice.tone.callwaiting =
+voice.tone.callwaiting = {$yealink_voice_tone_callwaiting}
 voice.tone.dialrecall =
 voice.tone.record=
 voice.tone.info =
diff --git a/resources/templates/provision/yealink/t33g/y000000000124.cfg b/resources/templates/provision/yealink/t33g/y000000000124.cfg
index bd32331e85..b752b2892f 100644
--- a/resources/templates/provision/yealink/t33g/y000000000124.cfg
+++ b/resources/templates/provision/yealink/t33g/y000000000124.cfg
@@ -587,7 +587,7 @@ voice.tone.message =
 voice.tone.stutter =
 voice.tone.info =
 voice.tone.dialrecall =
-voice.tone.callwaiting =
+voice.tone.callwaiting = {$yealink_voice_tone_callwaiting}
 voice.tone.congestion =
 voice.tone.busy =
 voice.tone.ring =
diff --git a/resources/templates/provision/yealink/t34w/y000000000171.cfg b/resources/templates/provision/yealink/t34w/y000000000171.cfg
index bad6f90653..60cd0820db 100644
--- a/resources/templates/provision/yealink/t34w/y000000000171.cfg
+++ b/resources/templates/provision/yealink/t34w/y000000000171.cfg
@@ -583,7 +583,7 @@ voice.tone.message =
 voice.tone.stutter =
 voice.tone.info =
 voice.tone.dialrecall =
-voice.tone.callwaiting =
+voice.tone.callwaiting = {$yealink_voice_tone_callwaiting}
 voice.tone.congestion =
 voice.tone.busy =
 voice.tone.ring =
diff --git a/resources/templates/provision/yealink/t38g/y000000000038.cfg b/resources/templates/provision/yealink/t38g/y000000000038.cfg
index 2332790ae4..7d026b31ed 100644
--- a/resources/templates/provision/yealink/t38g/y000000000038.cfg
+++ b/resources/templates/provision/yealink/t38g/y000000000038.cfg
@@ -345,7 +345,7 @@ voice.tone.dial =
 voice.tone.ring =
 voice.tone.busy =
 voice.tone.congestion =
-voice.tone.callwaiting =
+voice.tone.callwaiting ={$yealink_voice_tone_callwaiting}
 voice.tone.dialrecall =
 voice.tone.record=
 voice.tone.info =
diff --git a/resources/templates/provision/yealink/t40g/y000000000076.cfg b/resources/templates/provision/yealink/t40g/y000000000076.cfg
index b98b1f2c47..38bb3217ca 100644
--- a/resources/templates/provision/yealink/t40g/y000000000076.cfg
+++ b/resources/templates/provision/yealink/t40g/y000000000076.cfg
@@ -389,7 +389,7 @@ voice.tone.dial =
 voice.tone.ring =
 voice.tone.busy =
 voice.tone.congestion =
-voice.tone.callwaiting =
+voice.tone.callwaiting = {$yealink_voice_tone_callwaiting}
 voice.tone.dialrecall =
 voice.tone.record=
 voice.tone.info =
diff --git a/resources/templates/provision/yealink/t40p/y000000000054.cfg b/resources/templates/provision/yealink/t40p/y000000000054.cfg
index 3b28106b01..334b6b2b87 100644
--- a/resources/templates/provision/yealink/t40p/y000000000054.cfg
+++ b/resources/templates/provision/yealink/t40p/y000000000054.cfg
@@ -389,7 +389,7 @@ voice.tone.dial =
 voice.tone.ring =
 voice.tone.busy =
 voice.tone.congestion =
-voice.tone.callwaiting =
+voice.tone.callwaiting = {$yealink_voice_tone_callwaiting}
 voice.tone.dialrecall =
 voice.tone.record=
 voice.tone.info =
diff --git a/resources/templates/provision/yealink/t41p/y000000000036.cfg b/resources/templates/provision/yealink/t41p/y000000000036.cfg
index 6c806ae80a..9bbb8eb370 100644
--- a/resources/templates/provision/yealink/t41p/y000000000036.cfg
+++ b/resources/templates/provision/yealink/t41p/y000000000036.cfg
@@ -389,7 +389,7 @@ voice.tone.dial =
 voice.tone.ring =
 voice.tone.busy =
 voice.tone.congestion =
-voice.tone.callwaiting =
+voice.tone.callwaiting = {$yealink_voice_tone_callwaiting}
 voice.tone.dialrecall =
 voice.tone.record=
 voice.tone.info =
diff --git a/resources/templates/provision/yealink/t41s/y000000000068.cfg b/resources/templates/provision/yealink/t41s/y000000000068.cfg
index 2862ff4756..ef5f836658 100644
--- a/resources/templates/provision/yealink/t41s/y000000000068.cfg
+++ b/resources/templates/provision/yealink/t41s/y000000000068.cfg
@@ -506,7 +506,7 @@ voice.tone.message =
 voice.tone.stutter =
 voice.tone.info =
 voice.tone.dialrecall =
-voice.tone.callwaiting =
+voice.tone.callwaiting = {$yealink_voice_tone_callwaiting}
 voice.tone.congestion =
 voice.tone.busy =
 voice.tone.ring =
diff --git a/resources/templates/provision/yealink/t42g/y000000000029.cfg b/resources/templates/provision/yealink/t42g/y000000000029.cfg
index 3bea4a228a..bd56c1c9d1 100644
--- a/resources/templates/provision/yealink/t42g/y000000000029.cfg
+++ b/resources/templates/provision/yealink/t42g/y000000000029.cfg
@@ -389,7 +389,7 @@ voice.tone.dial =
 voice.tone.ring =
 voice.tone.busy =
 voice.tone.congestion =
-voice.tone.callwaiting =
+voice.tone.callwaiting = {$yealink_voice_tone_callwaiting}
 voice.tone.dialrecall =
 voice.tone.record=
 voice.tone.info =
diff --git a/resources/templates/provision/yealink/t42s/y000000000067.cfg b/resources/templates/provision/yealink/t42s/y000000000067.cfg
index 89daaa77f1..45ba6f99d8 100644
--- a/resources/templates/provision/yealink/t42s/y000000000067.cfg
+++ b/resources/templates/provision/yealink/t42s/y000000000067.cfg
@@ -514,7 +514,7 @@ voice.tone.message =
 voice.tone.stutter =
 voice.tone.info =
 voice.tone.dialrecall =
-voice.tone.callwaiting =
+voice.tone.callwaiting = {$yealink_voice_tone_callwaiting}
 voice.tone.congestion =
 voice.tone.busy =
 voice.tone.ring =
diff --git a/resources/templates/provision/yealink/t42u/y000000000116.cfg b/resources/templates/provision/yealink/t42u/y000000000116.cfg
index c6a09572ee..965cdddcdf 100644
--- a/resources/templates/provision/yealink/t42u/y000000000116.cfg
+++ b/resources/templates/provision/yealink/t42u/y000000000116.cfg
@@ -390,7 +390,7 @@ voice.tone.dial =
 voice.tone.ring =
 voice.tone.busy =
 voice.tone.congestion =
-voice.tone.callwaiting =
+voice.tone.callwaiting = {$yealink_voice_tone_callwaiting}
 voice.tone.dialrecall =
 voice.tone.record=
 voice.tone.info =
diff --git a/resources/templates/provision/yealink/t43u/y000000000107.cfg b/resources/templates/provision/yealink/t43u/y000000000107.cfg
index b39eb434bf..1c7c58c8e6 100644
--- a/resources/templates/provision/yealink/t43u/y000000000107.cfg
+++ b/resources/templates/provision/yealink/t43u/y000000000107.cfg
@@ -592,7 +592,7 @@ voice.tone.message =
 voice.tone.stutter =
 voice.tone.info =
 voice.tone.dialrecall =
-voice.tone.callwaiting =
+voice.tone.callwaiting = {$yealink_voice_tone_callwaiting}
 voice.tone.congestion =
 voice.tone.busy =
 voice.tone.ring =
diff --git a/resources/templates/provision/yealink/t44w/y000000000174.cfg b/resources/templates/provision/yealink/t44w/y000000000174.cfg
index 3b86ac782b..26bd0f70f5 100644
--- a/resources/templates/provision/yealink/t44w/y000000000174.cfg
+++ b/resources/templates/provision/yealink/t44w/y000000000174.cfg
@@ -583,7 +583,7 @@ voice.tone.message =
 voice.tone.stutter =
 voice.tone.info =
 voice.tone.dialrecall =
-voice.tone.callwaiting =
+voice.tone.callwaiting = {$yealink_voice_tone_callwaiting}
 voice.tone.congestion =
 voice.tone.busy =
 voice.tone.ring =
diff --git a/resources/templates/provision/yealink/t46g/y000000000028.cfg b/resources/templates/provision/yealink/t46g/y000000000028.cfg
index dbd99e8694..c6a9869f5b 100644
--- a/resources/templates/provision/yealink/t46g/y000000000028.cfg
+++ b/resources/templates/provision/yealink/t46g/y000000000028.cfg
@@ -415,7 +415,7 @@ voice.tone.dial =
 voice.tone.ring =
 voice.tone.busy =
 voice.tone.congestion =
-voice.tone.callwaiting =
+voice.tone.callwaiting = {$yealink_voice_tone_callwaiting}
 voice.tone.dialrecall =
 voice.tone.record=
 voice.tone.info =
diff --git a/resources/templates/provision/yealink/t46s/y000000000066.cfg b/resources/templates/provision/yealink/t46s/y000000000066.cfg
index c5da815c47..385cff7030 100644
--- a/resources/templates/provision/yealink/t46s/y000000000066.cfg
+++ b/resources/templates/provision/yealink/t46s/y000000000066.cfg
@@ -504,7 +504,7 @@ voice.tone.message =
 voice.tone.stutter =
 voice.tone.info =
 voice.tone.dialrecall =
-voice.tone.callwaiting =
+voice.tone.callwaiting = {$yealink_voice_tone_callwaiting}
 voice.tone.congestion =
 voice.tone.busy =
 voice.tone.ring =
diff --git a/resources/templates/provision/yealink/t46u/y000000000108.cfg b/resources/templates/provision/yealink/t46u/y000000000108.cfg
index 56e9b72bee..1e6c278c53 100644
--- a/resources/templates/provision/yealink/t46u/y000000000108.cfg
+++ b/resources/templates/provision/yealink/t46u/y000000000108.cfg
@@ -583,7 +583,7 @@ voice.tone.message =
 voice.tone.stutter =
 voice.tone.info =
 voice.tone.dialrecall =
-voice.tone.callwaiting =
+voice.tone.callwaiting = {$yealink_voice_tone_callwaiting}
 voice.tone.congestion =
 voice.tone.busy =
 voice.tone.ring =
diff --git a/resources/templates/provision/yealink/t48g/y000000000035.cfg b/resources/templates/provision/yealink/t48g/y000000000035.cfg
index 63fcb73965..cbfd25d992 100644
--- a/resources/templates/provision/yealink/t48g/y000000000035.cfg
+++ b/resources/templates/provision/yealink/t48g/y000000000035.cfg
@@ -415,7 +415,7 @@ voice.tone.dial =
 voice.tone.ring =
 voice.tone.busy =
 voice.tone.congestion =
-voice.tone.callwaiting =
+voice.tone.callwaiting = {$yealink_voice_tone_callwaiting}
 voice.tone.dialrecall =
 voice.tone.record=
 voice.tone.info =
diff --git a/resources/templates/provision/yealink/t48s/y000000000065.cfg b/resources/templates/provision/yealink/t48s/y000000000065.cfg
index 13eaa23b0a..4bf277a828 100644
--- a/resources/templates/provision/yealink/t48s/y000000000065.cfg
+++ b/resources/templates/provision/yealink/t48s/y000000000065.cfg
@@ -547,7 +547,7 @@ voice.tone.message =
 voice.tone.stutter =
 voice.tone.info =
 voice.tone.dialrecall =
-voice.tone.callwaiting =
+voice.tone.callwaiting = {$yealink_voice_tone_callwaiting}
 voice.tone.congestion =
 voice.tone.busy =
 voice.tone.ring =
diff --git a/resources/templates/provision/yealink/t48u/y000000000109.cfg b/resources/templates/provision/yealink/t48u/y000000000109.cfg
index 2b78c228a6..5c72d90307 100644
--- a/resources/templates/provision/yealink/t48u/y000000000109.cfg
+++ b/resources/templates/provision/yealink/t48u/y000000000109.cfg
@@ -584,7 +584,7 @@ voice.tone.message =
 voice.tone.stutter =
 voice.tone.info =
 voice.tone.dialrecall =
-voice.tone.callwaiting =
+voice.tone.callwaiting = {$yealink_voice_tone_callwaiting}
 voice.tone.congestion =
 voice.tone.busy =
 voice.tone.ring =
diff --git a/resources/templates/provision/yealink/t49g/y000000000051.cfg b/resources/templates/provision/yealink/t49g/y000000000051.cfg
index 71431e69ae..7840103ffb 100644
--- a/resources/templates/provision/yealink/t49g/y000000000051.cfg
+++ b/resources/templates/provision/yealink/t49g/y000000000051.cfg
@@ -348,7 +348,7 @@ voice.tone.dial =
 voice.tone.ring =
 voice.tone.busy =
 voice.tone.congestion =
-voice.tone.callwaiting =
+voice.tone.callwaiting = {$yealink_voice_tone_callwaiting}
 voice.tone.dialrecall =
 voice.tone.record=
 voice.tone.info =
diff --git a/resources/templates/provision/yealink/t52s/y000000000074.cfg b/resources/templates/provision/yealink/t52s/y000000000074.cfg
index 212066fde5..99e35915da 100644
--- a/resources/templates/provision/yealink/t52s/y000000000074.cfg
+++ b/resources/templates/provision/yealink/t52s/y000000000074.cfg
@@ -513,7 +513,7 @@ voice.tone.message =
 voice.tone.stutter =
 voice.tone.info =
 voice.tone.dialrecall =
-voice.tone.callwaiting =
+voice.tone.callwaiting = {$yealink_voice_tone_callwaiting}
 voice.tone.congestion =
 voice.tone.busy =
 voice.tone.ring =
diff --git a/resources/templates/provision/yealink/t53/y000000000095.cfg b/resources/templates/provision/yealink/t53/y000000000095.cfg
index 9e8d6c0898..39e8559d7c 100644
--- a/resources/templates/provision/yealink/t53/y000000000095.cfg
+++ b/resources/templates/provision/yealink/t53/y000000000095.cfg
@@ -577,7 +577,7 @@ voice.tone.message =
 voice.tone.stutter =
 voice.tone.info =
 voice.tone.dialrecall =
-voice.tone.callwaiting =
+voice.tone.callwaiting = {$yealink_voice_tone_callwaiting}
 voice.tone.congestion =
 voice.tone.busy =
 voice.tone.ring =
diff --git a/resources/templates/provision/yealink/t53w/y000000000095.cfg b/resources/templates/provision/yealink/t53w/y000000000095.cfg
index 8de973caab..c90bc85e84 100644
--- a/resources/templates/provision/yealink/t53w/y000000000095.cfg
+++ b/resources/templates/provision/yealink/t53w/y000000000095.cfg
@@ -577,7 +577,7 @@ voice.tone.message =
 voice.tone.stutter =
 voice.tone.info =
 voice.tone.dialrecall =
-voice.tone.callwaiting =
+voice.tone.callwaiting = {$yealink_voice_tone_callwaiting}
 voice.tone.congestion =
 voice.tone.busy =
 voice.tone.ring =
diff --git a/resources/templates/provision/yealink/t54s/y000000000070.cfg b/resources/templates/provision/yealink/t54s/y000000000070.cfg
index 26daf869c7..faaeb51d29 100644
--- a/resources/templates/provision/yealink/t54s/y000000000070.cfg
+++ b/resources/templates/provision/yealink/t54s/y000000000070.cfg
@@ -512,7 +512,7 @@ voice.tone.message =
 voice.tone.stutter =
 voice.tone.info =
 voice.tone.dialrecall =
-voice.tone.callwaiting =
+voice.tone.callwaiting = {$yealink_voice_tone_callwaiting}
 voice.tone.congestion =
 voice.tone.busy =
 voice.tone.ring =
diff --git a/resources/templates/provision/yealink/t54w/y000000000096.cfg b/resources/templates/provision/yealink/t54w/y000000000096.cfg
index 038dee41d5..7ab6b92242 100644
--- a/resources/templates/provision/yealink/t54w/y000000000096.cfg
+++ b/resources/templates/provision/yealink/t54w/y000000000096.cfg
@@ -576,7 +576,7 @@ voice.tone.message =
 voice.tone.stutter =
 voice.tone.info =
 voice.tone.dialrecall =
-voice.tone.callwaiting =
+voice.tone.callwaiting = {$yealink_voice_tone_callwaiting}
 voice.tone.congestion =
 voice.tone.busy =
 voice.tone.ring =
diff --git a/resources/templates/provision/yealink/t56a/y000000000056.cfg b/resources/templates/provision/yealink/t56a/y000000000056.cfg
index b4370cde62..26f43b88b9 100644
--- a/resources/templates/provision/yealink/t56a/y000000000056.cfg
+++ b/resources/templates/provision/yealink/t56a/y000000000056.cfg
@@ -406,7 +406,7 @@ voice.tone.dial =
 voice.tone.ring = 
 voice.tone.busy = 
 voice.tone.congestion = 
-voice.tone.callwaiting = 
+voice.tone.callwaiting = {$yealink_voice_tone_callwaiting}
 voice.tone.dialrecall = 
 voice.tone.info = 
 voice.tone.stutter = 
diff --git a/resources/templates/provision/yealink/t57w/y000000000097.cfg b/resources/templates/provision/yealink/t57w/y000000000097.cfg
index 1298611792..46ec0cfd82 100644
--- a/resources/templates/provision/yealink/t57w/y000000000097.cfg
+++ b/resources/templates/provision/yealink/t57w/y000000000097.cfg
@@ -575,7 +575,7 @@ voice.tone.message =
 voice.tone.stutter =
 voice.tone.info =
 voice.tone.dialrecall =
-voice.tone.callwaiting =
+voice.tone.callwaiting = {$yealink_voice_tone_callwaiting}
 voice.tone.congestion =
 voice.tone.busy =
 voice.tone.ring =
diff --git a/resources/templates/provision/yealink/t58a/y000000000058.cfg b/resources/templates/provision/yealink/t58a/y000000000058.cfg
index a55d881d51..42b0c97b89 100644
--- a/resources/templates/provision/yealink/t58a/y000000000058.cfg
+++ b/resources/templates/provision/yealink/t58a/y000000000058.cfg
@@ -407,7 +407,7 @@ voice.tone.dial =
 voice.tone.ring = 
 voice.tone.busy = 
 voice.tone.congestion = 
-voice.tone.callwaiting = 
+voice.tone.callwaiting = {$yealink_voice_tone_callwaiting}
 voice.tone.dialrecall = 
 voice.tone.info = 
 voice.tone.stutter = 
diff --git a/resources/templates/provision/yealink/t58v/y000000000058.cfg b/resources/templates/provision/yealink/t58v/y000000000058.cfg
index d6f1d37cbb..bb0e9db32a 100644
--- a/resources/templates/provision/yealink/t58v/y000000000058.cfg
+++ b/resources/templates/provision/yealink/t58v/y000000000058.cfg
@@ -407,7 +407,7 @@ voice.tone.dial =
 voice.tone.ring = 
 voice.tone.busy = 
 voice.tone.congestion = 
-voice.tone.callwaiting = 
+voice.tone.callwaiting = {$yealink_voice_tone_callwaiting}
 voice.tone.dialrecall = 
 voice.tone.info = 
 voice.tone.stutter = 
diff --git a/resources/templates/provision/yealink/t58w/y000000000150.cfg b/resources/templates/provision/yealink/t58w/y000000000150.cfg
index 33088d15f4..cdc33e62bc 100644
--- a/resources/templates/provision/yealink/t58w/y000000000150.cfg
+++ b/resources/templates/provision/yealink/t58w/y000000000150.cfg
@@ -458,7 +458,7 @@ voice.tone.dial =
 voice.tone.ring =
 voice.tone.busy =
 voice.tone.congestion =
-voice.tone.callwaiting =
+voice.tone.callwaiting = {$yealink_voice_tone_callwaiting}
 voice.tone.dialrecall =
 voice.tone.info =
 voice.tone.stutter =
diff --git a/resources/templates/provision/yealink/w60b/y000000000077.cfg b/resources/templates/provision/yealink/w60b/y000000000077.cfg
index 1355ac3120..08a3ea8e8c 100644
--- a/resources/templates/provision/yealink/w60b/y000000000077.cfg
+++ b/resources/templates/provision/yealink/w60b/y000000000077.cfg
@@ -486,7 +486,7 @@ voice.tone.country = {$yealink_voice_tone_country}
 voice.tone.dial =
 voice.tone.ring =
 voice.tone.busy =
-voice.tone.callwaiting =
+voice.tone.callwaiting = {$yealink_voice_tone_callwaiting}
 
 
 #######################################################################################
diff --git a/resources/templates/provision/yealink/w70b/y000000000146.cfg b/resources/templates/provision/yealink/w70b/y000000000146.cfg
index 7aa9e79902..41b0ffc444 100644
--- a/resources/templates/provision/yealink/w70b/y000000000146.cfg
+++ b/resources/templates/provision/yealink/w70b/y000000000146.cfg
@@ -480,7 +480,7 @@ voice.tone.country = {$yealink_voice_tone_country}
 voice.tone.dial =
 voice.tone.ring =
 voice.tone.busy =
-voice.tone.callwaiting =
+voice.tone.callwaiting = {$yealink_voice_tone_callwaiting}
 
 
 #######################################################################################

From 37840abb98fe39239986928a28a9d627421eefea Mon Sep 17 00:00:00 2001
From: FusionPBX <mark@fusionpbx.com>
Date: Thu, 20 Feb 2025 09:51:08 -0700
Subject: [PATCH 30/55] Fix the cdr http_enabled boolean condition

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

diff --git a/app/xml_cdr/resources/classes/xml_cdr.php b/app/xml_cdr/resources/classes/xml_cdr.php
index 5c14cf3bd5..9cf18165ce 100644
--- a/app/xml_cdr/resources/classes/xml_cdr.php
+++ b/app/xml_cdr/resources/classes/xml_cdr.php
@@ -1695,7 +1695,7 @@ if (!class_exists('xml_cdr')) {
 
 				//if http enabled is set to false then deny access
 					if (!defined('STDIN')) {
-						if ($this->settings->get('cdr', 'http_enabled') == "false") {
+						if ($this->settings->get('cdr', 'http_enabled') == false) {
 							openlog('FusionPBX', LOG_NDELAY, LOG_AUTH);
 							syslog(LOG_WARNING, '['.$_SERVER['REMOTE_ADDR'].'] XML CDR import default setting http_enabled is not enabled. Line: '.__line__);
 							closelog();

From fd34a000a6465b3e5b62f9f84dc3656e5d355e00 Mon Sep 17 00:00:00 2001
From: frytimo <tim@fusionpbx.com>
Date: Thu, 20 Feb 2025 14:24:39 -0400
Subject: [PATCH 31/55] Add old search method for auto loading classes (#7261)

Adding this commit to ensure backwards compatibility and a fail-safe mechanism for loading a class
---
 resources/classes/auto_loader.php | 51 +++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/resources/classes/auto_loader.php b/resources/classes/auto_loader.php
index fcb0b4fce3..85dbcdb261 100644
--- a/resources/classes/auto_loader.php
+++ b/resources/classes/auto_loader.php
@@ -125,6 +125,41 @@ class auto_loader {
 			return true;
 		}
 
+		//cache miss
+		if (!empty($_REQUEST['debug']) && $_REQUEST['debug'] == 'true') {
+			openlog("PHP", LOG_PID | LOG_PERROR, LOG_LOCAL0);
+			syslog(LOG_WARNING, "[php][auto_loader] class not found in cache: ".$class_name);
+			closelog();
+		}
+
+		//set project path using magic dir constant
+		$project_path = dirname(__DIR__, 2);
+
+		//build the search path array
+		$search_path[] = glob($project_path . "/resources/classes/".$class_name.".php");
+		$search_path[] = glob($project_path . "/resources/interfaces/".$class_name.".php");
+		$search_path[] = glob($project_path . "/resources/traits/".$class_name.".php");
+		$search_path[] = glob($project_path . "/*/*/resources/classes/".$class_name.".php");
+		$search_path[] = glob($project_path . "/*/*/resources/interfaces/".$class_name.".php");
+		$search_path[] = glob($project_path . "/*/*/resources/traits/".$class_name.".php");
+
+		//find the path
+		$path = self::autoload_search($search_path);
+		if (!empty($path)) {
+
+			//include the class or interface
+			include $path;
+
+			//make sure to reload the cache after we found a new class
+			$this->reload_classes();
+
+			//update the cache with new classes
+			$this->update_cache();
+
+			//return boolean
+			return true;
+		}
+
 		//send to syslog when debugging
 		if (!empty($_REQUEST['debug']) && $_REQUEST['debug'] == 'true') {
 			openlog("PHP", LOG_PID | LOG_PERROR, LOG_LOCAL0);
@@ -135,4 +170,20 @@ class auto_loader {
 		//return boolean
 		return false;
 	}
+
+	public static function autoload_search($array) : string {
+		foreach($array as $path) {
+			if (is_array($path) && count($path) != 0) {
+				foreach($path as $sub_path) {
+					if (!empty($sub_path) && file_exists($sub_path)) {
+						return $sub_path;
+					}
+				}
+			}
+			elseif (!empty($path) && file_exists($path)) {
+				return $path;
+			}
+		}
+		return '';
+	}
 }

From e416e74c30336d9cf4090bb6031803047508ddbe Mon Sep 17 00:00:00 2001
From: Alex <40072887+alexdcrane@users.noreply.github.com>
Date: Thu, 20 Feb 2025 11:25:36 -0700
Subject: [PATCH 32/55] Add domain change to require.php (#7263)

---
 resources/require.php | 44 +++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 42 insertions(+), 2 deletions(-)

diff --git a/resources/require.php b/resources/require.php
index f1ddbd8b06..23495d6c71 100644
--- a/resources/require.php
+++ b/resources/require.php
@@ -17,7 +17,7 @@
 
 	The Initial Developer of the Original Code is
 	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2008-2023
+	Portions created by the Initial Developer are Copyright (C) 2008-2025
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):
@@ -33,7 +33,7 @@
 	}
 	elseif (file_exists(getenv('SystemDrive') . DIRECTORY_SEPARATOR . 'ProgramData' . DIRECTORY_SEPARATOR . 'fusionpbx' . DIRECTORY_SEPARATOR . 'config.conf')) {
 		$config_file =  getenv('SystemDrive') . DIRECTORY_SEPARATOR . 'ProgramData' . DIRECTORY_SEPARATOR . 'fusionpbx' . DIRECTORY_SEPARATOR . 'config.conf';
-	}	
+	}
 	elseif (file_exists(__DIR__ . '/config.php')) {
 		//set a custom config_file variable after the config.php has been validated
 		$file_content = trim(file_get_contents(__DIR__ . '/config.php'));
@@ -144,4 +144,44 @@
 		$_SESSION['domain']['language']['code'] = $_REQUEST['view_lang_code'];
 	}
 
+//change the domain
+	if (!empty($_GET["domain_uuid"]) && is_uuid($_GET["domain_uuid"]) && $_GET["domain_change"] == "true" && permission_exists('domain_select')) {
+
+		//connect to the database
+			$database = database::new();
+
+		//include domains
+			if (file_exists($_SERVER["PROJECT_ROOT"]."/app/domains/app_config.php") && !permission_exists('domain_all')) {
+				include_once "app/domains/domains.php";
+			}
+
+		//update the domain session variables
+			$domain_uuid = $_GET["domain_uuid"];
+			$_SESSION["previous_domain_uuid"] = $_SESSION['domain_uuid'];
+			$_SESSION['domain_uuid'] = $domain_uuid;
+
+		//get the domain details
+			$sql = "select * from v_domains ";
+			$sql .= "order by domain_name asc ";
+			$domains = $database->select($sql, null, 'all');
+			if (!empty($domains)) {
+				foreach($domains as $row) {
+					$_SESSION['domains'][$row['domain_uuid']] = $row;
+				}
+			}
+			unset($sql, $domains);
+
+		//update the domain session variables
+			$_SESSION["domain_name"] = $_SESSION['domains'][$domain_uuid]['domain_name'];
+			$_SESSION['domain']['template']['name'] = $_SESSION['domains'][$domain_uuid]['template_name'] ?? null;
+			$_SESSION["context"] = $_SESSION["domain_name"];
+
+		//clear the extension array so that it is regenerated for the selected domain
+			unset($_SESSION['extension_array']);
+
+		//set the setting arrays
+			$domain = new domains();
+			$domain->set();
+	}
+
 ?>

From 036731202eb9143a542eeb297e23a965b919bf93 Mon Sep 17 00:00:00 2001
From: Alex <40072887+alexdcrane@users.noreply.github.com>
Date: Thu, 20 Feb 2025 11:33:06 -0700
Subject: [PATCH 33/55] Remove unnecessary if statement (#7264)

---
 core/domains/domains.php | 78 ++++++++++++++++++++--------------------
 1 file changed, 38 insertions(+), 40 deletions(-)

diff --git a/core/domains/domains.php b/core/domains/domains.php
index c059ebc34b..bf68b7a1b8 100644
--- a/core/domains/domains.php
+++ b/core/domains/domains.php
@@ -17,7 +17,7 @@
 
 	The Initial Developer of the Original Code is
 	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2018 - 2022
+	Portions created by the Initial Developer are Copyright (C) 2018-2025
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):
@@ -39,52 +39,50 @@
 	}
 
 //change the domain
-	if (!empty($_GET["domain_uuid"]) && is_uuid($_GET["domain_uuid"]) && $_GET["domain_change"] == "true") {
-		if (permission_exists('domain_select')) {
+	if (!empty($_GET["domain_uuid"]) && is_uuid($_GET["domain_uuid"]) && $_GET["domain_change"] == "true" && permission_exists('domain_select')) {
 
-			//update the domain session variables
-				$domain_uuid = $_GET["domain_uuid"];
+		//update the domain session variables
+			$domain_uuid = $_GET["domain_uuid"];
 
-			//get the domain details
-				$sql = "select * from v_domains ";
-				$sql .= "order by domain_name asc ";
-				$domains = $database->select($sql, null, 'all');
-				if (!empty($domains)) {
-					foreach($domains as $row) {
-						$_SESSION['domains'][$row['domain_uuid']] = $row;
-					}
+		//get the domain details
+			$sql = "select * from v_domains ";
+			$sql .= "order by domain_name asc ";
+			$domains = $database->select($sql, null, 'all');
+			if (!empty($domains)) {
+				foreach($domains as $row) {
+					$_SESSION['domains'][$row['domain_uuid']] = $row;
 				}
-				unset($sql, $domains);
+			}
+			unset($sql, $domains);
 
-			//validate the domain change
-				if (empty($_SESSION['domains'][$domain_uuid])) {
-					die("invalid domain");
-				}
-			
-			//update the domain session variables
-				$_SESSION["previous_domain_uuid"] = $_SESSION['domain_uuid'];
-				$_SESSION['domain_uuid'] = $domain_uuid;
-				$_SESSION["domain_name"] = $_SESSION['domains'][$domain_uuid]['domain_name'];
-				$_SESSION['domain']['template']['name'] = $_SESSION['domains'][$domain_uuid]['template_name'] ?? null;
-				$_SESSION["context"] = $_SESSION["domain_name"];
+		//validate the domain change
+			if (empty($_SESSION['domains'][$domain_uuid])) {
+				die("invalid domain");
+			}
 
-			//clear the extension array so that it is regenerated for the selected domain
-				unset($_SESSION['extension_array']);
+		//update the domain session variables
+			$_SESSION["previous_domain_uuid"] = $_SESSION['domain_uuid'];
+			$_SESSION['domain_uuid'] = $domain_uuid;
+			$_SESSION["domain_name"] = $_SESSION['domains'][$domain_uuid]['domain_name'];
+			$_SESSION['domain']['template']['name'] = $_SESSION['domains'][$domain_uuid]['template_name'] ?? null;
+			$_SESSION["context"] = $_SESSION["domain_name"];
 
-			//set the setting arrays
-				$domain = new domains();
-				$domain->set();
+		//clear the extension array so that it is regenerated for the selected domain
+			unset($_SESSION['extension_array']);
 
-			//redirect the user
-				if (!empty($_SESSION["login"]["destination"])) {
-					// to default, or domain specific, login destination
-					header("Location: ".PROJECT_PATH.$_SESSION["login"]["destination"]["text"]);
-				}
-				else {
-					header("Location: ".PROJECT_PATH."/core/dashboard/");
-				}
-				exit;
-		}
+		//set the setting arrays
+			$domain = new domains();
+			$domain->set();
+
+		//redirect the user
+			if (!empty($_SESSION["login"]["destination"])) {
+				// to default, or domain specific, login destination
+				header("Location: ".PROJECT_PATH.$_SESSION["login"]["destination"]["text"]);
+			}
+			else {
+				header("Location: ".PROJECT_PATH."/core/dashboard/");
+			}
+			exit;
 	}
 
 //check permission

From c2fe9d32f75bbe4a68bbe976501aad1f86107153 Mon Sep 17 00:00:00 2001
From: FusionPBX <markjcrane@gmail.com>
Date: Thu, 20 Feb 2025 15:01:28 -0700
Subject: [PATCH 34/55] Fix a voicemail bug Fix the voicemail link Use only one
 keep local feature Deprecate the voicemail_local_after_forward

---
 .../resources/functions/send_email.lua        | 689 +++++++++---------
 app/voicemails/app_config.php                 |   7 +-
 app/voicemails/app_languages.php              |  56 +-
 app/voicemails/voicemail_edit.php             |  49 --
 4 files changed, 346 insertions(+), 455 deletions(-)

diff --git a/app/switch/resources/scripts/app/voicemail/resources/functions/send_email.lua b/app/switch/resources/scripts/app/voicemail/resources/functions/send_email.lua
index eaaa53dbb2..05ed42cb48 100644
--- a/app/switch/resources/scripts/app/voicemail/resources/functions/send_email.lua
+++ b/app/switch/resources/scripts/app/voicemail/resources/functions/send_email.lua
@@ -25,364 +25,361 @@
 --	POSSIBILITY OF SUCH DAMAGE.
 
 --load libraries
-	local send_mail = require 'resources.functions.send_mail'
-	local Database = require "resources.functions.database"
-	local Settings = require "resources.functions.lazy_settings"
+local send_mail = require 'resources.functions.send_mail'
+local Database = require "resources.functions.database"
+local Settings = require "resources.functions.lazy_settings"
 
 --define a function to send email
-	function send_email(id, uuid)
+function send_email(id, uuid)
+	--prepare the database, settings and variables
 		local db = dbh or Database.new('system');
 		local settings = Settings.new(db, domain_name, domain_uuid);
 		local http_protocol = settings:get('domain', 'http_protocol', 'text') or "https";
 		local email_queue_enabled = "true";
 
-		--get voicemail message details
-			local sql = [[SELECT * FROM v_voicemails
-				WHERE domain_uuid = :domain_uuid
-				AND voicemail_id = :voicemail_id]]
-			local params = {domain_uuid = domain_uuid, voicemail_id = id};
-			if (debug["sql"]) then
-				freeswitch.consoleLog("notice", "[voicemail] SQL: " .. sql .. "; params:" .. json.encode(params) .. "\n");
-			end
-			dbh:query(sql, params, function(row)
-				db_voicemail_uuid = string.lower(row["voicemail_uuid"]);
-				--voicemail_password = row["voicemail_password"];
-				--greeting_id = row["greeting_id"];
-				voicemail_mail_to = row["voicemail_mail_to"];
-				voicemail_transcription_enabled = row["voicemail_transcription_enabled"];
-				voicemail_file = row["voicemail_file"];
-				voicemail_local_after_email = row["voicemail_local_after_email"];
-				voicemail_local_after_forward = row["voicemail_local_after_forward"];
-				voicemail_description = row["voicemail_description"];
-			end);
+	--get voicemail message details
+		local sql = [[SELECT * FROM v_voicemails
+			WHERE domain_uuid = :domain_uuid
+			AND voicemail_id = :voicemail_id]]
+		local params = {domain_uuid = domain_uuid, voicemail_id = id};
+		if (debug["sql"]) then
+			freeswitch.consoleLog("notice", "[voicemail] SQL: " .. sql .. "; params:" .. json.encode(params) .. "\n");
+		end
+		dbh:query(sql, params, function(row)
+			db_voicemail_uuid = string.lower(row["voicemail_uuid"]);
+			--voicemail_password = row["voicemail_password"];
+			--greeting_id = row["greeting_id"];
+			voicemail_mail_to = row["voicemail_mail_to"];
+			voicemail_transcription_enabled = row["voicemail_transcription_enabled"];
+			voicemail_file = row["voicemail_file"];
+			voicemail_local_after_email = row["voicemail_local_after_email"];
+			voicemail_description = row["voicemail_description"];
+		end);
 
-		--set default values
-			if (voicemail_file == nil) then
-				voicemail_file = "listen";
-			end
-			if (voicemail_local_after_email == nil) then
-				voicemail_local_after_email = "true";
-			end
-			if (voicemail_local_after_forward == nil) then
-				voicemail_local_after_forward = "true";
-			end
+	--set default values
+		if (voicemail_file == nil or voicemail_file == '') then
+			voicemail_file = "listen";
+		end
+		if (voicemail_local_after_email == nil or voicemail_local_after_email == '') then
+			voicemail_local_after_email = "true";
+		end
 
-		--require the email address to send the email
-			if (string.len(voicemail_mail_to) > 2) then
-				--include languages file
-					local Text = require "resources.functions.text"
-					local text = Text.new("app.voicemail.app_languages")
-					local dbh = dbh
+	--require the email address to send the email
+		if (string.len(voicemail_mail_to) > 2) then
+			--include languages file
+				local Text = require "resources.functions.text"
+				local text = Text.new("app.voicemail.app_languages")
+				local dbh = dbh
 
-				--user setting time zone, if set
-					local sql = [[
-						select
-							us.user_setting_value as time_zone
-						from
-							v_user_settings as us,
-							v_extension_users as eu,
-							v_extensions as e,
-							v_voicemails as v
-						where
-							v.voicemail_id = :voicemail_id and
-							v.domain_uuid = :domain_uuid and
-							v.voicemail_id = e.extension and
-							e.domain_uuid = :domain_uuid and
-							e.extension_uuid = eu.extension_uuid and
-							eu.domain_uuid = :domain_uuid and
-							eu.user_uuid = us.user_uuid and
-							us.domain_uuid = :domain_uuid and
-							us.user_setting_category = 'domain' and
-							us.user_setting_subcategory = 'time_zone' and
-							us.user_setting_name = 'name' and
-							us.user_setting_enabled = 'true'
-						order by
-							eu.insert_date asc
-						limit 1
-						]]
-					local params = {domain_uuid = domain_uuid, voicemail_id = id};
-					if (debug["sql"]) then
-						freeswitch.consoleLog("notice", "[voicemail] SQL: " .. sql .. "; params:" .. json.encode(params) .. "\n");
-					end
-					dbh:query(sql, params, function(row)
-						time_zone = row["time_zone"];
-					end);
+			--user setting time zone, if set
+				local sql = [[
+					select
+						us.user_setting_value as time_zone
+					from
+						v_user_settings as us,
+						v_extension_users as eu,
+						v_extensions as e,
+						v_voicemails as v
+					where
+						v.voicemail_id = :voicemail_id and
+						v.domain_uuid = :domain_uuid and
+						v.voicemail_id = e.extension and
+						e.domain_uuid = :domain_uuid and
+						e.extension_uuid = eu.extension_uuid and
+						eu.domain_uuid = :domain_uuid and
+						eu.user_uuid = us.user_uuid and
+						us.domain_uuid = :domain_uuid and
+						us.user_setting_category = 'domain' and
+						us.user_setting_subcategory = 'time_zone' and
+						us.user_setting_name = 'name' and
+						us.user_setting_enabled = 'true'
+					order by
+						eu.insert_date asc
+					limit 1
+					]]
+				local params = {domain_uuid = domain_uuid, voicemail_id = id};
+				if (debug["sql"]) then
+					freeswitch.consoleLog("notice", "[voicemail] SQL: " .. sql .. "; params:" .. json.encode(params) .. "\n");
+				end
+				dbh:query(sql, params, function(row)
+					time_zone = row["time_zone"];
+				end);
 
-				--default/domain setting time zone
-					if (time_zone == nil or time_zone == '') then
-						time_zone = settings:get('domain', 'time_zone', 'name');
-					end
-
-				--default time zone
-					if (time_zone == nil or time_zone == '') then
-						time_zone = 'UTC';
-					end
-
-				--connect using other backend if needed
-					if storage_type == "base64" then
-						dbh = Database.new('system', 'base64/read')
-					end
-
-				--get voicemail message details
-					local sql = [[SELECT to_char(timezone(:time_zone, to_timestamp(created_epoch)), 'Day DD Mon YYYY HH:MI:SS PM') as message_date, *
-						FROM v_voicemail_messages
-						WHERE domain_uuid = :domain_uuid
-						AND voicemail_message_uuid = :uuid]]
-					local params = {domain_uuid = domain_uuid, uuid = uuid, time_zone = time_zone};
-					if (debug["sql"]) then
-						freeswitch.consoleLog("notice", "[voicemail] SQL: " .. sql .. "; params:" .. json.encode(params) .. "\n");
-					end
-					dbh:query(sql, params, function(row)
-						--get the values from the database
-							--uuid = row["voicemail_message_uuid"];
-							created_epoch = row["created_epoch"];
-							caller_id_name = row["caller_id_name"];
-							caller_id_number = row["caller_id_number"];
-							message_date = row["message_date"];
-							message_length = row["message_length"];
-							--message_status = row["message_status"];
-							--message_priority = row["message_priority"];
-						--get the recordings from the database
-							if (storage_type == "base64") then
-								--set the voicemail intro and message paths
-									message_location = voicemail_dir.."/"..id.."/msg_"..uuid.."."..vm_message_ext;
-									intro_location = voicemail_dir.."/"..id.."/intro_"..uuid.."."..vm_message_ext;
-
-								--save the recordings to the file system
-									if (string.len(row["message_base64"]) > 32) then
-										--save the value to a variable
-											voicemail_base64 = row["message_base64"];
-
-										--include the file io
-											local file = require "resources.functions.file"
-
-										--write decoded message string to file
-											file.write_base64(message_location, row["message_base64"]);
-
-										--write decoded intro string to file, if any
-											if (string.len(row["message_intro_base64"]) > 32) then
-												file.write_base64(intro_location, row["message_intro_base64"]);
-											end
-									end
-							end
-					end);
-
-				--close temporary connection
-					if storage_type == "base64" then
-						dbh:release()
-					end
-
-				--format the message length and date
-					message_length_formatted = format_seconds(message_length);
-					if (debug["info"]) then
-						freeswitch.consoleLog("notice", "[voicemail] message date: " .. message_date .. "\n");
-						freeswitch.consoleLog("notice", "[voicemail] message length: " .. message_length .. "\n");
-					end
-					--local message_date = os.date("%A, %d %b %Y %I:%M %p", created_epoch);
-
-				--connect to the database
-					local dbh = Database.new('system');
-
-				--get the templates
-					local sql = "SELECT * FROM v_email_templates ";
-					sql = sql .. "WHERE (domain_uuid = :domain_uuid or domain_uuid is null) ";
-					sql = sql .. "AND template_language = :template_language ";
-					sql = sql .. "AND template_category = 'voicemail' "
-					if (voicemail_transcription_enabled == 'true') then
-						sql = sql .. "AND template_subcategory = 'transcription' "
-					else
-						sql = sql .. "AND template_subcategory = 'default' "
-					end
-					sql = sql .. "AND template_enabled = 'true' "
-					sql = sql .. "ORDER BY domain_uuid DESC "
-					local params = {domain_uuid = domain_uuid, template_language = default_language.."-"..default_dialect};
-					if (debug["sql"]) then
-						freeswitch.consoleLog("notice", "[voicemail] SQL: " .. sql .. "; params:" .. json.encode(params) .. "\n");
-					end
-					dbh:query(sql, params, function(row)
-						subject = row["template_subject"];
-						body = row["template_body"];
-					end);
-
-				--get the link_address
-					link_address = http_protocol.."://"..domain_name..project_path;
-
-				--set proper delete status
-					local local_after_email = '';
-					if (voicemail_local_after_email == "false" or voicemail_local_after_forward == "false") then
-						local_after_email = "false";
-					else
-						local_after_email = "true";
-					end
-
-				--prepare the headers
-					local headers = {
-						["X-FusionPBX-Domain-UUID"] = domain_uuid;
-						["X-FusionPBX-Domain-Name"] = domain_name;
-						["X-FusionPBX-Call-UUID"] = uuid;
-						["X-FusionPBX-Email-Type"] = 'voicemail';
-						["X-FusionPBX-local_after_email"] = local_after_email;
-					}
-
-				--prepare the voicemail_name_formatted
-					voicemail_name_formatted = id;
-					local display_domain_name = settings:get('voicemail', 'display_domain_name', 'boolean');
-
-					if (display_domain_name == 'true') then
-						voicemail_name_formatted = id.."@"..domain_name;
-					end
-					if (voicemail_description ~= nil and voicemail_description ~= "" and voicemail_description ~= id) then
-						voicemail_name_formatted = voicemail_name_formatted.." ("..voicemail_description..")";
-					end
-
-				--prepare file
-					file = voicemail_dir.."/"..id.."/msg_"..uuid.."."..vm_message_ext;
-
-				--combine intro, if exists, with message for emailing (only)
-					intro = voicemail_dir.."/"..id.."/intro_"..uuid.."."..vm_message_ext;
-					combined = voicemail_dir.."/"..id.."/intro_msg_"..uuid.."."..vm_message_ext;
-					if (file_exists(intro) and file_exists(file)) then
-						os.execute("sox "..intro.." "..file.." "..combined);
-					end
-
-				--prepare the subject
-					if (subject ~= nil) then
-						subject = subject:gsub("${caller_id_name}", caller_id_name);
-						subject = subject:gsub("${caller_id_number}", caller_id_number);
-						subject = subject:gsub("${message_date}", message_date);
-						subject = subject:gsub("${message_duration}", message_length_formatted);
-						subject = subject:gsub("${account}", voicemail_name_formatted);
-						subject = subject:gsub("${voicemail_id}", id);
-						subject = subject:gsub("${voicemail_description}", voicemail_description);
-						subject = subject:gsub("${voicemail_name_formatted}", voicemail_name_formatted);
-						subject = subject:gsub("${domain_name}", domain_name);
-						subject = subject:gsub("${new_messages}", new_messages);
-						subject = trim(subject);
-					else
-						subject = text['label-voicemail'] .. ' ' .. caller_id_name .. ' <' .. caller_id_number .. '> ' .. message_length_formatted;
-					end
-					subject = '=?utf-8?B?'..base64.encode(subject)..'?=';
-
-				--prepare the body
-					if (body ~= nil) then
-						body = body:gsub("${caller_id_name}", caller_id_name);
-						body = body:gsub("${caller_id_number}", caller_id_number);
-						body = body:gsub("${message_date}", message_date);
-						if (transcription ~= nil) then
-							transcription = transcription:gsub("%%", "*");
-							body = body:gsub("${message_text}", transcription);
-						end
-						body = body:gsub("${message_duration}", message_length_formatted);
-						body = body:gsub("${account}", voicemail_name_formatted);
-						body = body:gsub("${voicemail_id}", id);
-						body = body:gsub("${voicemail_description}", voicemail_description);
-						body = body:gsub("${voicemail_name_formatted}", voicemail_name_formatted);
-						body = body:gsub("${domain_name}", domain_name);
-						body = body:gsub("${sip_to_user}", id);
-						if (origination_callee_id_name ~= nil) then
-							body = body:gsub("${origination_callee_id_name}", origination_callee_id_name);
-						end
-						body = body:gsub("${dialed_user}", id);
-						if (voicemail_file == "attach" and file) then
-							body = body:gsub("${message}", text['label-attached']);
-						elseif (voicemail_file == "link") then
-							body = body:gsub("${message}", "<a href='"..link_address.."/app/voicemails/voicemail_messages.php?action=download&id="..id.."&voicemail_uuid="..db_voicemail_uuid.."&uuid="..uuid.."&t=bin'>"..text['label-download'].."</a>");
-						else
-							body = body:gsub("${message}", "<a href='"..link_address.."/app/voicemails/voicemail_messages.php?action=autoplay&id="..db_voicemail_uuid.."&uuid="..uuid.."&vm="..id.."'>"..text['label-listen'].."</a>");
-						end
-						--body = body:gsub(" ", "&nbsp;");
-						--body = body:gsub("%s+", "");
-						--body = body:gsub("&nbsp;", " ");
-						body = trim(body);
-					else
-						body = '<html><body>';
-						if (caller_id_name ~= nil and caller_id_name ~= caller_id_number) then
-							body = body .. caller_id_name .. '<br>';
-						end
-						body = body .. caller_id_number .. '<br>';
-						body = body .. message_date .. '<br>';
-						if (voicemail_file == "attach" and file) then
-							body = body .. '<br>' .. text['label-attached'];
-						elseif (voicemail_file == "link") then
-							body = body .. "<br><a href='"..link_address.."/app/voicemails/voicemail_messages.php?action=download&id="..id.."&voicemail_uuid="..db_voicemail_uuid.."&uuid="..uuid.."&t=bin'>"..text['label-download'].."</a>";
-						else
-							body = body .. "<br><a href='"..link_address.."/app/voicemails/voicemail_messages.php?action=autoplay&id="..db_voicemail_uuid.."&uuid="..uuid.."&vm="..id.."'>"..text['label-listen'].."</a>";
-						end
-						body = body .. '</body></html>';
-					end
-
-				--get the smtp from address and name
-					smtp_from = settings:get('voicemail', 'smtp_from', 'text');
-					smtp_from_name = settings:get('voicemail', 'smtp_from_name', 'text');
-					if (smtp_from == nil or smtp_from == '') then
-						smtp_from = settings:get('email', 'smtp_from', 'text');
-					end
-					if (smtp_from_name == nil or smtp_from_name == '') then
-						smtp_from_name = settings:get('email', 'smtp_from_name', 'text');
-					end
-					if (smtp_from_name and string.len(smtp_from_name) > 0 and smtp_from and string.len(smtp_from) > 2) then
-						smtp_from = smtp_from_name.."<"..smtp_from..">";
-					end
-
-				--send the email with, or without, including the intro
-					if (file_exists(combined)) then
-						voicemail_path = combined
-					else
-						voicemail_path = file
-					end
-
-				--send the email
-					send_mail(headers,
-						smtp_from,
-						voicemail_mail_to,
-						{subject, body},
-						(voicemail_file == "attach") and voicemail_path,
-						voicemail_base64
-					);
-
-			end
-
-		--whether to keep the voicemail message and details local after email
-			if (string.len(voicemail_mail_to) > 2 and email_queue_enabled == 'false') then
-				if (voicemail_local_after_email == "false" and voicemail_local_after_forward == "false") then
-					--delete the voicemail message details
-						local sql = [[DELETE FROM v_voicemail_messages
-							WHERE domain_uuid = :domain_uuid
-							AND voicemail_uuid = :voicemail_uuid
-							AND voicemail_message_uuid = :uuid]]
-						local params = {domain_uuid = domain_uuid,
-							voicemail_uuid = db_voicemail_uuid, uuid = uuid};
-						if (debug["sql"]) then
-							freeswitch.consoleLog("notice", "[voicemail] SQL: " .. sql .. "; params:" .. json.encode(params) .. "\n");
-						end
-						dbh:query(sql, params);
-					--delete voicemail recording files
-						if (file_exists(file)) then
-							os.remove(file);
-						end
-						if (file_exists(intro)) then
-							os.remove(intro);
-						end
-						if (file_exists(combined)) then
-							os.remove(combined);
-						end
-					--set message waiting indicator
-						message_waiting(id, domain_uuid);
-					--clear the variable
-						db_voicemail_uuid = '';
-				elseif (storage_type == "base64") then
-					--delete voicemail recording files
-						if (file_exists(file)) then
-							os.remove(file);
-						end
-						if (file_exists(intro)) then
-							os.remove(intro);
-						end
-						if (file_exists(combined)) then
-							os.remove(combined);
-						end
+			--default/domain setting time zone
+				if (time_zone == nil or time_zone == '') then
+					time_zone = settings:get('domain', 'time_zone', 'name');
 				end
 
+			--default time zone
+				if (time_zone == nil or time_zone == '') then
+					time_zone = 'UTC';
+				end
+
+			--connect using other backend if needed
+				if storage_type == "base64" then
+					dbh = Database.new('system', 'base64/read')
+				end
+
+			--get voicemail message details
+				local sql = [[SELECT to_char(timezone(:time_zone, to_timestamp(created_epoch)), 'Day DD Mon YYYY HH:MI:SS PM') as message_date, *
+					FROM v_voicemail_messages
+					WHERE domain_uuid = :domain_uuid
+					AND voicemail_message_uuid = :uuid]]
+				local params = {domain_uuid = domain_uuid, uuid = uuid, time_zone = time_zone};
+				if (debug["sql"]) then
+					freeswitch.consoleLog("notice", "[voicemail] SQL: " .. sql .. "; params:" .. json.encode(params) .. "\n");
+				end
+				dbh:query(sql, params, function(row)
+					--get the values from the database
+						--uuid = row["voicemail_message_uuid"];
+						created_epoch = row["created_epoch"];
+						caller_id_name = row["caller_id_name"];
+						caller_id_number = row["caller_id_number"];
+						message_date = row["message_date"];
+						message_length = row["message_length"];
+						--message_status = row["message_status"];
+						--message_priority = row["message_priority"];
+					--get the recordings from the database
+						if (storage_type == "base64") then
+							--set the voicemail intro and message paths
+								message_location = voicemail_dir.."/"..id.."/msg_"..uuid.."."..vm_message_ext;
+								intro_location = voicemail_dir.."/"..id.."/intro_"..uuid.."."..vm_message_ext;
+
+							--save the recordings to the file system
+								if (string.len(row["message_base64"]) > 32) then
+									--save the value to a variable
+										voicemail_base64 = row["message_base64"];
+
+									--include the file io
+										local file = require "resources.functions.file"
+
+									--write decoded message string to file
+										file.write_base64(message_location, row["message_base64"]);
+
+									--write decoded intro string to file, if any
+										if (string.len(row["message_intro_base64"]) > 32) then
+											file.write_base64(intro_location, row["message_intro_base64"]);
+										end
+								end
+						end
+				end);
+
+			--close temporary connection
+				if storage_type == "base64" then
+					dbh:release()
+				end
+
+			--format the message length and date
+				message_length_formatted = format_seconds(message_length);
+				if (debug["info"]) then
+					freeswitch.consoleLog("notice", "[voicemail] message date: " .. message_date .. "\n");
+					freeswitch.consoleLog("notice", "[voicemail] message length: " .. message_length .. "\n");
+				end
+				--local message_date = os.date("%A, %d %b %Y %I:%M %p", created_epoch);
+
+			--connect to the database
+				local dbh = Database.new('system');
+
+			--get the templates
+				local sql = "SELECT * FROM v_email_templates ";
+				sql = sql .. "WHERE (domain_uuid = :domain_uuid or domain_uuid is null) ";
+				sql = sql .. "AND template_language = :template_language ";
+				sql = sql .. "AND template_category = 'voicemail' "
+				if (voicemail_transcription_enabled == 'true') then
+					sql = sql .. "AND template_subcategory = 'transcription' "
+				else
+					sql = sql .. "AND template_subcategory = 'default' "
+				end
+				sql = sql .. "AND template_enabled = 'true' "
+				sql = sql .. "ORDER BY domain_uuid DESC "
+				local params = {domain_uuid = domain_uuid, template_language = default_language.."-"..default_dialect};
+				if (debug["sql"]) then
+					freeswitch.consoleLog("notice", "[voicemail] SQL: " .. sql .. "; params:" .. json.encode(params) .. "\n");
+				end
+				dbh:query(sql, params, function(row)
+					subject = row["template_subject"];
+					body = row["template_body"];
+				end);
+
+			--get the link_address
+				link_address = http_protocol.."://"..domain_name..project_path;
+
+			--set proper delete status
+				local local_after_email = '';
+				if (voicemail_local_after_email == "false") then
+					local_after_email = "false";
+				else
+					local_after_email = "true";
+				end
+
+			--prepare the headers
+				local headers = {
+					["X-FusionPBX-Domain-UUID"] = domain_uuid;
+					["X-FusionPBX-Domain-Name"] = domain_name;
+					["X-FusionPBX-Call-UUID"] = uuid;
+					["X-FusionPBX-Email-Type"] = 'voicemail';
+					["X-FusionPBX-local_after_email"] = local_after_email;
+				}
+
+			--prepare the voicemail_name_formatted
+				voicemail_name_formatted = id;
+				local display_domain_name = settings:get('voicemail', 'display_domain_name', 'boolean');
+
+				if (display_domain_name == 'true') then
+					voicemail_name_formatted = id.."@"..domain_name;
+				end
+				if (voicemail_description ~= nil and voicemail_description ~= "" and voicemail_description ~= id) then
+					voicemail_name_formatted = voicemail_name_formatted.." ("..voicemail_description..")";
+				end
+
+			--prepare file
+				file = voicemail_dir.."/"..id.."/msg_"..uuid.."."..vm_message_ext;
+
+			--combine intro, if exists, with message for emailing (only)
+				intro = voicemail_dir.."/"..id.."/intro_"..uuid.."."..vm_message_ext;
+				combined = voicemail_dir.."/"..id.."/intro_msg_"..uuid.."."..vm_message_ext;
+				if (file_exists(intro) and file_exists(file)) then
+					os.execute("sox "..intro.." "..file.." "..combined);
+				end
+
+			--prepare the subject
+				if (subject ~= nil) then
+					subject = subject:gsub("${caller_id_name}", caller_id_name);
+					subject = subject:gsub("${caller_id_number}", caller_id_number);
+					subject = subject:gsub("${message_date}", message_date);
+					subject = subject:gsub("${message_duration}", message_length_formatted);
+					subject = subject:gsub("${account}", voicemail_name_formatted);
+					subject = subject:gsub("${voicemail_id}", id);
+					subject = subject:gsub("${voicemail_description}", voicemail_description);
+					subject = subject:gsub("${voicemail_name_formatted}", voicemail_name_formatted);
+					subject = subject:gsub("${domain_name}", domain_name);
+					subject = subject:gsub("${new_messages}", new_messages);
+					subject = trim(subject);
+				else
+					subject = text['label-voicemail'] .. ' ' .. caller_id_name .. ' <' .. caller_id_number .. '> ' .. message_length_formatted;
+				end
+				subject = '=?utf-8?B?'..base64.encode(subject)..'?=';
+
+			--prepare the body
+				if (body ~= nil) then
+					body = body:gsub("${caller_id_name}", caller_id_name);
+					body = body:gsub("${caller_id_number}", caller_id_number);
+					body = body:gsub("${message_date}", message_date);
+					if (transcription ~= nil) then
+						transcription = transcription:gsub("%%", "*");
+						body = body:gsub("${message_text}", transcription);
+					end
+					body = body:gsub("${message_duration}", message_length_formatted);
+					body = body:gsub("${account}", voicemail_name_formatted);
+					body = body:gsub("${voicemail_id}", id);
+					body = body:gsub("${voicemail_description}", voicemail_description);
+					body = body:gsub("${voicemail_name_formatted}", voicemail_name_formatted);
+					body = body:gsub("${domain_name}", domain_name);
+					body = body:gsub("${sip_to_user}", id);
+					if (origination_callee_id_name ~= nil) then
+						body = body:gsub("${origination_callee_id_name}", origination_callee_id_name);
+					end
+					body = body:gsub("${dialed_user}", id);
+					if (voicemail_file == "attach" and file) then
+						body = body:gsub("${message}", text['label-attached']);
+					elseif (voicemail_file == "link") then
+						body = body:gsub("${message}", "<a href='"..link_address.."/app/voicemails/voicemail_messages.php?action=download&id="..id.."&voicemail_uuid="..db_voicemail_uuid.."&uuid="..uuid.."&t=bin'>"..text['label-download'].."</a>");
+					else
+						body = body:gsub("${message}", "<a href='"..link_address.."/app/voicemails/voicemail_messages.php?action=autoplay&id="..db_voicemail_uuid.."&uuid="..uuid.."&vm="..id.."'>"..text['label-listen'].."</a>");
+					end
+					--body = body:gsub(" ", "&nbsp;");
+					--body = body:gsub("%s+", "");
+					--body = body:gsub("&nbsp;", " ");
+					body = trim(body);
+				else
+					body = '<html><body>';
+					if (caller_id_name ~= nil and caller_id_name ~= caller_id_number) then
+						body = body .. caller_id_name .. '<br>';
+					end
+					body = body .. caller_id_number .. '<br>';
+					body = body .. message_date .. '<br>';
+					if (voicemail_file == "attach" and file) then
+						body = body .. '<br>' .. text['label-attached'];
+					elseif (voicemail_file == "link") then
+						body = body .. "<br><a href='"..link_address.."/app/voicemails/voicemail_messages.php?action=download&id="..id.."&voicemail_uuid="..db_voicemail_uuid.."&uuid="..uuid.."&t=bin'>"..text['label-download'].."</a>";
+					else
+						body = body .. "<br><a href='"..link_address.."/app/voicemails/voicemail_messages.php?action=autoplay&id="..db_voicemail_uuid.."&uuid="..uuid.."&vm="..id.."'>"..text['label-listen'].."</a>";
+					end
+					body = body .. '</body></html>';
+				end
+
+			--get the smtp from address and name
+				smtp_from = settings:get('voicemail', 'smtp_from', 'text');
+				smtp_from_name = settings:get('voicemail', 'smtp_from_name', 'text');
+				if (smtp_from == nil or smtp_from == '') then
+					smtp_from = settings:get('email', 'smtp_from', 'text');
+				end
+				if (smtp_from_name == nil or smtp_from_name == '') then
+					smtp_from_name = settings:get('email', 'smtp_from_name', 'text');
+				end
+				if (smtp_from_name and string.len(smtp_from_name) > 0 and smtp_from and string.len(smtp_from) > 2) then
+					smtp_from = smtp_from_name.."<"..smtp_from..">";
+				end
+
+			--send the email with, or without, including the intro
+				if (file_exists(combined)) then
+					voicemail_path = combined
+				else
+					voicemail_path = file
+				end
+
+			--send the email
+				send_mail(headers,
+					smtp_from,
+					voicemail_mail_to,
+					{subject, body},
+					(voicemail_file == "attach") and voicemail_path,
+					voicemail_base64
+				);
+
+		end
+
+	--whether to keep the voicemail message and details local after email
+		if (string.len(voicemail_mail_to) > 2 and email_queue_enabled == 'false') then
+			if (voicemail_local_after_email == "false") then
+				--delete the voicemail message details
+					local sql = [[DELETE FROM v_voicemail_messages
+						WHERE domain_uuid = :domain_uuid
+						AND voicemail_uuid = :voicemail_uuid
+						AND voicemail_message_uuid = :uuid]]
+					local params = {domain_uuid = domain_uuid,
+						voicemail_uuid = db_voicemail_uuid, uuid = uuid};
+					if (debug["sql"]) then
+						freeswitch.consoleLog("notice", "[voicemail] SQL: " .. sql .. "; params:" .. json.encode(params) .. "\n");
+					end
+					dbh:query(sql, params);
+				--delete voicemail recording files
+					if (file_exists(file)) then
+						os.remove(file);
+					end
+					if (file_exists(intro)) then
+						os.remove(intro);
+					end
+					if (file_exists(combined)) then
+						os.remove(combined);
+					end
+				--set message waiting indicator
+					message_waiting(id, domain_uuid);
+				--clear the variable
+					db_voicemail_uuid = '';
+			elseif (storage_type == "base64") then
+				--delete voicemail recording files
+					if (file_exists(file)) then
+						os.remove(file);
+					end
+					if (file_exists(intro)) then
+						os.remove(intro);
+					end
+					if (file_exists(combined)) then
+						os.remove(combined);
+					end
 			end
 
-	end
+		end
+
+end
diff --git a/app/voicemails/app_config.php b/app/voicemails/app_config.php
index 11d6f974b0..6adc844b91 100644
--- a/app/voicemails/app_config.php
+++ b/app/voicemails/app_config.php
@@ -180,10 +180,6 @@
 		$apps[$x]['permissions'][$y]['groups'][] = "user";
 		$apps[$x]['permissions'][$y]['groups'][] = "agent";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = "voicemail_local_after_forward";
-		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
-		$apps[$x]['permissions'][$y]['groups'][] = "admin";
-		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "voicemail_recording_instructions";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
@@ -491,6 +487,7 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['search'] = 'true';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Choose to keep the voicemail file after sending to forward destinations.";
+		$apps[$x]['db'][$y]['fields'][$z]['deprecated'] = "true";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "voicemail_enabled";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
@@ -751,4 +748,4 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 
-?>
+?>
\ No newline at end of file
diff --git a/app/voicemails/app_languages.php b/app/voicemails/app_languages.php
index ecaa6b0d9c..6c0ec4839a 100644
--- a/app/voicemails/app_languages.php
+++ b/app/voicemails/app_languages.php
@@ -649,33 +649,6 @@ $text['label-voicemail_local_after_email']['zh-cn'] = "保持本地";
 $text['label-voicemail_local_after_email']['ja-jp'] = "ローカルに保つ";
 $text['label-voicemail_local_after_email']['ko-kr'] = "로컬 유지";
 
-$text['label-voicemail_local_after_forward']['en-us'] = "Keep Local After Forward";
-$text['label-voicemail_local_after_forward']['en-gb'] = "Keep Local After Forward";
-$text['label-voicemail_local_after_forward']['ar-eg'] = "الحفاظ على المحلية بعد الأمام";
-$text['label-voicemail_local_after_forward']['de-at'] = "Nach Weiterleitung lokal behalten";
-$text['label-voicemail_local_after_forward']['de-ch'] = "Nach Weiterleitung lokal behalten";
-$text['label-voicemail_local_after_forward']['de-de'] = "Nach Weiterleitung lokal behalten";
-$text['label-voicemail_local_after_forward']['el-gr'] = "Keep Local After Forward";
-$text['label-voicemail_local_after_forward']['es-cl'] = "Mantener local después de avanzar";
-$text['label-voicemail_local_after_forward']['es-mx'] = "Mantener local después de avanzar";
-$text['label-voicemail_local_after_forward']['fr-ca'] = "Rester local après le transfert";
-$text['label-voicemail_local_after_forward']['fr-fr'] = "Rester local après le transfert";
-$text['label-voicemail_local_after_forward']['he-il'] = "שמור על מקומי לאחר קדימה";
-$text['label-voicemail_local_after_forward']['it-it'] = "Mantieni locale dopo l'inoltro";
-$text['label-voicemail_local_after_forward']['ka-ge'] = "გადაგზავნის შემდეგ ადგილობრივად შენარჩუნება";
-$text['label-voicemail_local_after_forward']['nl-nl'] = "Lokaal behouden na doorsturen";
-$text['label-voicemail_local_after_forward']['pl-pl'] = "Zachowaj lokalny po przesłaniu dalej";
-$text['label-voicemail_local_after_forward']['pt-br'] = "Manter local depois de encaminhar";
-$text['label-voicemail_local_after_forward']['pt-pt'] = "Manter local depois de encaminhar";
-$text['label-voicemail_local_after_forward']['ro-ro'] = "Păstrați local după redirecționare";
-$text['label-voicemail_local_after_forward']['ru-ru'] = "Сохранять локальное значение после пересылки";
-$text['label-voicemail_local_after_forward']['sv-se'] = "Håll lokal efter Forward";
-$text['label-voicemail_local_after_forward']['uk-ua'] = "Зберігати локальні після пересилання";
-$text['label-voicemail_local_after_forward']['tr-tr'] = "İleriden Sonra Yerel Tut";
-$text['label-voicemail_local_after_forward']['zh-cn'] = "转发后保持本地";
-$text['label-voicemail_local_after_forward']['ja-jp'] = "転送後もローカルに保持";
-$text['label-voicemail_local_after_forward']['ko-kr'] = "전달 후 로컬 유지";
-
 $text['label-voicemail_transcribe_enabled']['en-us'] = "Transcribe";
 $text['label-voicemail_transcribe_enabled']['en-gb'] = "Transcribe";
 $text['label-voicemail_transcribe_enabled']['ar-eg'] = "نسخ";
@@ -1836,33 +1809,6 @@ $text['description-voicemail_local_after_email']['zh-cn'] = "选择发送电子
 $text['description-voicemail_local_after_email']['ja-jp'] = "電子メール通知の送信後にボイスメールをシステムに保持するかどうかを選択します。";
 $text['description-voicemail_local_after_email']['ko-kr'] = "이메일 알림을 보낸 후 시스템에 음성 메일을 유지할지 여부를 선택합니다.";
 
-$text['description-voicemail_local_after_forward']['en-us'] = "Choose whether to keep the voicemail in this mailbox after sending to the defined Forward Destination(s).";
-$text['description-voicemail_local_after_forward']['en-gb'] = "Choose whether to keep the voicemail in this mailbox after sending to the defined Forward Destination(s).";
-$text['description-voicemail_local_after_forward']['ar-eg'] = "اختر ما إذا كنت تريد الاحتفاظ بالبريد الصوتي في صندوق البريد هذا بعد إرساله إلى وجهة (وجهات) إعادة التوجيه المحددة.";
-$text['description-voicemail_local_after_forward']['de-at'] = "Wählen Sie, ob die Voicemail nach dem Senden an die definierten Weiterleitungsziele in dieser Mailbox bleiben soll.";
-$text['description-voicemail_local_after_forward']['de-ch'] = "Wählen Sie, ob die Voicemail nach dem Senden an die definierten Weiterleitungsziele in dieser Mailbox bleiben soll.";
-$text['description-voicemail_local_after_forward']['de-de'] = "Wählen Sie, ob die Voicemail nach dem Senden an die definierten Weiterleitungsziele in dieser Mailbox bleiben soll.";
-$text['description-voicemail_local_after_forward']['el-gr'] = "Επιλέξτε εάν θα διατηρηθεί ο τηλεφωνητής σε αυτό το γραμματοκιβώτιο μετά την αποστολή στον καθορισμένο(ους) Προορισμό(ους).";
-$text['description-voicemail_local_after_forward']['es-cl'] = "Elija si desea conservar el correo de voz en este buzón después de enviarlo a los destinos de reenvío definidos.";
-$text['description-voicemail_local_after_forward']['es-mx'] = "Elija si desea conservar el correo de voz en este buzón después de enviarlo a los destinos de reenvío definidos.";
-$text['description-voicemail_local_after_forward']['fr-ca'] = "Choisissez si vous souhaitez conserver la messagerie vocale dans cette boîte aux lettres après l'envoi vers la ou les destinations de transfert définies.";
-$text['description-voicemail_local_after_forward']['fr-fr'] = "Choisissez si vous souhaitez conserver la messagerie vocale dans cette boîte aux lettres après l'envoi vers la ou les destinations de transfert définies.";
-$text['description-voicemail_local_after_forward']['he-il'] = "בחר אם לשמור את הדואר הקולי בתיבת הדואר הזו לאחר השליחה ליעד/ים המוגדרים.";
-$text['description-voicemail_local_after_forward']['it-it'] = "Scegliere se conservare i messaggi vocali in questa casella di posta dopo l'invio alle destinazioni di inoltro definite.";
-$text['description-voicemail_local_after_forward']['ka-ge'] = "აირჩიეთ, დარჩება თუ არა ხმოვანი ფოსტა ამ საფოსტო ყუთში განსაზღვრულ დანიშნულების პუნქტებამდე გაგზავნის შემდეგ.";
-$text['description-voicemail_local_after_forward']['nl-nl'] = "Kies of u de voicemail in deze mailbox wilt bewaren na verzending naar de gedefinieerde doorstuurbestemming(en).";
-$text['description-voicemail_local_after_forward']['pl-pl'] = "Wybierz, czy poczta głosowa ma być przechowywana w tej skrzynce pocztowej po wysłaniu do określonych miejsc docelowych przekazywania.";
-$text['description-voicemail_local_after_forward']['pt-br'] = "Escolha se deseja manter o correio de voz nesta caixa postal após enviar para o(s) destino(s) de encaminhamento definido(s).";
-$text['description-voicemail_local_after_forward']['pt-pt'] = "Escolha se deseja manter o correio de voz nesta caixa postal após enviar para o(s) destino(s) de encaminhamento definido(s).";
-$text['description-voicemail_local_after_forward']['ro-ro'] = "Alegeți dacă doriți să păstrați mesageria vocală în această cutie poștală după trimiterea către destinația (destinațiile) de redirecționare definite.";
-$text['description-voicemail_local_after_forward']['ru-ru'] = "Выберите, следует ли сохранять голосовую почту в этом почтовом ящике после отправки в определенные пункты назначения пересылки.";
-$text['description-voicemail_local_after_forward']['sv-se'] = "Välj om du vill behålla röstbrevlådan i den här brevlådan efter att ha skickats till den eller de definierade vidarebefordrandestinationerna.";
-$text['description-voicemail_local_after_forward']['uk-ua'] = "Виберіть, чи зберігати голосову пошту в цій поштовій скриньці після надсилання на визначені пункти призначення.";
-$text['description-voicemail_local_after_forward']['tr-tr'] = "Tanımlanan İletme Hedef(ler)ine gönderdikten sonra sesli postanın bu posta kutusunda tutulup tutulmayacağını seçin.";
-$text['description-voicemail_local_after_forward']['zh-cn'] = "选择在发送到定义的转发目的地后是否将语音邮件保留在此邮箱中。";
-$text['description-voicemail_local_after_forward']['ja-jp'] = "定義された転送先に送信した後、ボイスメールをこのメールボックスに保持するかどうかを選択します。";
-$text['description-voicemail_local_after_forward']['ko-kr'] = "정의된 전달 대상으로 음성 메일을 보낸 후 이 사서함에 음성 메일을 보관할지 여부를 선택합니다.";
-
 $text['description-voicemail_id']['en-us'] = "Enter the Voicemail ID";
 $text['description-voicemail_id']['en-gb'] = "Enter the Voicemail ID";
 $text['description-voicemail_id']['ar-eg'] = "أدخل معرف البريد الصوتي";
@@ -2726,4 +2672,4 @@ $text['message-emails_resent']['zh-cn'] = "电子邮件已重新发送";
 $text['message-emails_resent']['ja-jp'] = "再送信メール";
 $text['message-emails_resent']['ko-kr'] = "이메일 재전송";
 
-?>
+?>
\ No newline at end of file
diff --git a/app/voicemails/voicemail_edit.php b/app/voicemails/voicemail_edit.php
index a5aaec41da..1da52e957e 100644
--- a/app/voicemails/voicemail_edit.php
+++ b/app/voicemails/voicemail_edit.php
@@ -100,7 +100,6 @@
 			$voicemail_file = $_POST["voicemail_file"];
 			$voicemail_local_after_email = $_POST["voicemail_local_after_email"] ?? null;
 			$voicemail_destination = $_POST["voicemail_destination"];
-			$voicemail_local_after_forward = $_POST["voicemail_local_after_forward"] ?? null;
 			$voicemail_enabled = $_POST["voicemail_enabled"] ?? 'false';
 			$voicemail_description = $_POST["voicemail_description"];
 			$voicemail_tutorial = $_POST["voicemail_tutorial"] ?? null;
@@ -181,21 +180,6 @@
 					if (permission_exists('voicemail_local_after_email') && !empty($voicemail_mail_to)) {
 						$array['voicemails'][0]['voicemail_local_after_email'] = $voicemail_local_after_email ?? 'false';
 					}
-					else if (permission_exists('voicemail_local_after_forward')) {
-						$array['voicemails'][0]['voicemail_local_after_email'] = $voicemail_local_after_forward ?? 'false';
-					}
-					else {
-						$array['voicemails'][0]['voicemail_local_after_email'] = 'true';
-					}
-					if (permission_exists('voicemail_local_after_forward')) {
-						$array['voicemails'][0]['voicemail_local_after_forward'] = $voicemail_local_after_forward ?? 'false';
-					}
-					else if (permission_exists('voicemail_local_after_email') && !empty($voicemail_mail_to)) {
-						$array['voicemails'][0]['voicemail_local_after_forward'] = $voicemail_local_after_email ?? 'false';
-					}
-					else {
-						$array['voicemails'][0]['voicemail_local_after_forward'] = 'true';
-					}
 					$array['voicemails'][0]['voicemail_enabled'] = $voicemail_enabled;
 					$array['voicemails'][0]['voicemail_description'] = $voicemail_description;
 
@@ -362,7 +346,6 @@
 			$voicemail_recording_options = $row["voicemail_recording_options"];
 			$voicemail_file = $row["voicemail_file"];
 			$voicemail_local_after_email = $row["voicemail_local_after_email"];
-			$voicemail_local_after_forward = $row["voicemail_local_after_forward"];
 			$voicemail_enabled = $row["voicemail_enabled"];
 			$voicemail_description = $row["voicemail_description"];
 		}
@@ -371,7 +354,6 @@
 	else {
 		$voicemail_file = $_SESSION['voicemail']['voicemail_file']['text'];
 		$voicemail_local_after_email = $_SESSION['voicemail']['keep_local']['boolean'];
-		$voicemail_local_after_forward = $_SESSION['voicemail']['keep_local']['boolean'];
 	}
 
 //remove the spaces
@@ -381,7 +363,6 @@
 
 //set the defaults
 	if (empty($voicemail_local_after_email)) { $voicemail_local_after_email = 'true'; }
-	if (empty($voicemail_local_after_forward)) { $voicemail_local_after_forward = 'true'; }
 	if (empty($voicemail_enabled)) { $voicemail_enabled = 'true'; }
 	if (empty($voicemail_transcription_enabled)) { $voicemail_transcription_enabled = $_SESSION['voicemail']['transcription_enabled_default']['boolean']; }
 	if (empty($voicemail_tutorial)) { $voicemail_tutorial = 'false'; }
@@ -970,36 +951,6 @@
 		echo "	</tr>";
 	}
 
-	if (
-		permission_exists('voicemail_forward') &&
-		permission_exists('voicemail_local_after_forward') &&
-		!empty($voicemail_destinations_assigned) &&
-		is_array($voicemail_destinations_assigned)
-		) {
-		echo "<tr>\n";
-		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
-		echo "	".$text['label-voicemail_local_after_forward']."\n";
-		echo "</td>\n";
-		echo "<td class='vtable' align='left'>\n";
-		if (substr($_SESSION['theme']['input_toggle_style']['text'], 0, 6) == 'switch') {
-			echo "	<label class='switch'>\n";
-			echo "		<input type='checkbox' id='voicemail_local_after_forward' name='voicemail_local_after_forward' value='true' ".($voicemail_local_after_forward == 'true' ? "checked='checked'" : null).">\n";
-			echo "		<span class='slider'></span> \n";
-			echo "	</label>\n";
-		}
-		else {
-			echo "	<select class='formfld' id='voicemail_local_after_forward' name='voicemail_local_after_forward'>\n";
-			echo "		<option value='true'>".$text['option-true']."</option>\n";
-			echo "		<option value='false' ".($voicemail_local_after_forward == 'false' ? "selected='selected'" : null).">".$text['option-false']."</option>\n";
-			echo "	</select>\n";
-		}
-		echo "<br />\n";
-		echo $text['description-voicemail_local_after_forward']."\n";
-		echo "</td>\n";
-		echo "</tr>\n";
-		unset($voicemail_destinations_assigned);
-	}
-
 	echo "<tr>\n";
 	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
 	echo "	".$text['label-voicemail_enabled']."\n";

From 8cfc221da4191c9440f8516c1af473db46d050b2 Mon Sep 17 00:00:00 2001
From: Alex <40072887+alexdcrane@users.noreply.github.com>
Date: Thu, 20 Feb 2025 16:30:09 -0700
Subject: [PATCH 35/55] Redirect to the correct domain if using show all
 (#7265)

* Redirect to the correct domain if using show all

* Update bridges.php

* Update call_recordings.php

* Update conference_controls.php

* Update conference_profile_params.php

* Update conference_profiles.php

* Update email_queue.php

* Update event_guard_logs.php

* Update fax_queue.php

* Update user_settings.php

* Update require.php
---
 app/access_controls/access_controls.php             | 5 +++++
 app/bridges/bridges.php                             | 4 ++++
 app/call_block/call_block.php                       | 5 +++++
 app/call_broadcast/call_broadcast.php               | 5 +++++
 app/call_center_active/call_center_queue.php        | 4 ++++
 app/call_centers/call_center_agents.php             | 5 +++++
 app/call_centers/call_center_queues.php             | 5 +++++
 app/call_flows/call_flows.php                       | 5 +++++
 app/call_forward/call_forward.php                   | 4 ++++
 app/conference_centers/conference_centers.php       | 5 +++++
 app/conference_centers/conference_rooms.php         | 5 +++++
 app/conferences/conferences.php                     | 5 +++++
 app/database_transactions/database_transactions.php | 5 +++++
 app/destinations/destinations.php                   | 5 +++++
 app/devices/device_profiles.php                     | 5 +++++
 app/devices/device_vendor_functions.php             | 5 +++++
 app/devices/device_vendors.php                      | 5 +++++
 app/devices/devices.php                             | 5 +++++
 app/dialplans/dialplans.php                         | 8 ++++++++
 app/email_queue/email_queue.php                     | 4 ++++
 app/email_templates/email_templates.php             | 5 +++++
 app/event_guard/event_guard_logs.php                | 4 ++++
 app/extensions/extensions.php                       | 5 +++++
 app/fax/fax.php                                     | 5 +++++
 app/fax_queue/fax_queue.php                         | 4 ++++
 app/fifo/fifo.php                                   | 4 ++++
 app/gateways/gateways.php                           | 5 +++++
 app/ivr_menus/ivr_menus.php                         | 5 +++++
 app/modules/modules.php                             | 5 +++++
 app/number_translations/number_translations.php     | 5 +++++
 app/phrases/phrases.php                             | 5 +++++
 app/pin_numbers/pin_numbers.php                     | 5 +++++
 app/recordings/recordings.php                       | 5 +++++
 app/ring_groups/ring_groups.php                     | 5 +++++
 app/sip_profiles/sip_profiles.php                   | 5 +++++
 app/sip_status/sip_status.php                       | 1 +
 app/sofia_global_settings/sofia_global_settings.php | 5 +++++
 app/streams/streams.php                             | 5 +++++
 app/time_conditions/time_conditions.php             | 5 +++++
 app/vars/vars.php                                   | 5 +++++
 app/voicemail_greetings/voicemail_greetings.php     | 5 +++++
 app/voicemails/voicemails.php                       | 5 +++++
 app/xml_cdr/xml_cdr.php                             | 5 +++++
 core/contacts/contact_addresses.php                 | 5 +++++
 core/contacts/contact_attachments.php               | 5 +++++
 core/contacts/contact_emails.php                    | 5 +++++
 core/contacts/contact_extensions.php                | 5 +++++
 core/contacts/contact_notes.php                     | 5 +++++
 core/contacts/contact_phones.php                    | 5 +++++
 core/contacts/contact_relations.php                 | 5 +++++
 core/contacts/contact_settings.php                  | 5 +++++
 core/contacts/contact_times.php                     | 5 +++++
 core/contacts/contact_urls.php                      | 5 +++++
 core/contacts/contacts.php                          | 5 +++++
 core/dashboard/dashboard.php                        | 5 +++++
 core/databases/databases.php                        | 1 +
 core/users/users.php                                | 5 +++++
 57 files changed, 273 insertions(+)

diff --git a/app/access_controls/access_controls.php b/app/access_controls/access_controls.php
index ac6f92a527..e049c83431 100644
--- a/app/access_controls/access_controls.php
+++ b/app/access_controls/access_controls.php
@@ -211,8 +211,12 @@
 	if (!empty($access_controls) && count($access_controls) > 0) {
 		$x = 0;
 		foreach ($access_controls as $row) {
+			$list_row_url = '';
 			if (permission_exists('access_control_edit')) {
 				$list_row_url = "access_control_edit.php?id=".urlencode($row['access_control_uuid']);
+				if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) {
+					$list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true';
+				}
 			}
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('access_control_add') || permission_exists('access_control_edit') || permission_exists('access_control_delete')) {
@@ -254,3 +258,4 @@
 	require_once "resources/footer.php";
 
 ?>
+
diff --git a/app/bridges/bridges.php b/app/bridges/bridges.php
index 39946553f0..ce706932a3 100644
--- a/app/bridges/bridges.php
+++ b/app/bridges/bridges.php
@@ -234,8 +234,12 @@
 	if (!empty($bridges)) {
 		$x = 0;
 		foreach ($bridges as $row) {
+			$list_row_url = '';
 			if (permission_exists('bridge_edit')) {
 				$list_row_url = "bridge_edit.php?id=".urlencode($row['bridge_uuid']);
+				if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) {
+					$list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true';
+				}
 			}
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('bridge_add') || permission_exists('bridge_edit') || permission_exists('bridge_delete')) {
diff --git a/app/call_block/call_block.php b/app/call_block/call_block.php
index 83484517eb..6ed672bc6d 100644
--- a/app/call_block/call_block.php
+++ b/app/call_block/call_block.php
@@ -309,8 +309,12 @@
 	if (!empty($result)) {
 		$x = 0;
 		foreach ($result as $row) {
+			$list_row_url = '';
 			if (permission_exists('call_block_edit')) {
 				$list_row_url = "call_block_edit.php?id=".urlencode($row['call_block_uuid']);
+				if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) {
+					$list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true';
+				}
 			}
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('call_block_add') || permission_exists('call_block_edit') || permission_exists('call_block_delete')) {
@@ -405,3 +409,4 @@
 	require_once "resources/footer.php";
 
 ?>
+
diff --git a/app/call_broadcast/call_broadcast.php b/app/call_broadcast/call_broadcast.php
index 33ad94f238..6e6cd20c00 100644
--- a/app/call_broadcast/call_broadcast.php
+++ b/app/call_broadcast/call_broadcast.php
@@ -227,8 +227,12 @@
 	if (!empty($result)) {
 		$x = 0;
 		foreach($result as $row) {
+			$list_row_url = '';
 			if (permission_exists('call_broadcast_edit')) {
 				$list_row_url = "call_broadcast_edit.php?id=".urlencode($row['call_broadcast_uuid']);
+				if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) {
+					$list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true';
+				}
 			}
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('call_broadcast_add') || permission_exists('call_broadcast_delete')) {
@@ -286,3 +290,4 @@
 	require_once "resources/footer.php";
 
 ?>
+
diff --git a/app/call_center_active/call_center_queue.php b/app/call_center_active/call_center_queue.php
index 3b10afdf77..427a8f1716 100644
--- a/app/call_center_active/call_center_queue.php
+++ b/app/call_center_active/call_center_queue.php
@@ -128,6 +128,9 @@
 		$x = 0;
 		foreach($call_center_queues as $row) {
 			$list_row_url = PROJECT_PATH."/app/call_center_active/call_center_active.php?queue_name=".escape($row['call_center_queue_uuid'])."&name=".urlencode(escape($row['queue_name']));
+			if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) {
+				$list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true';
+			}
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			echo "	<td><a href='".$list_row_url."'>".escape($row['queue_name'])."</a></td>\n";
 			echo "	<td>".escape($row['queue_extension'])."</td>\n";
@@ -159,3 +162,4 @@
 	require_once "resources/footer.php";
 
 ?>
+
diff --git a/app/call_centers/call_center_agents.php b/app/call_centers/call_center_agents.php
index 07951e8535..9d76bf34bb 100644
--- a/app/call_centers/call_center_agents.php
+++ b/app/call_centers/call_center_agents.php
@@ -214,8 +214,12 @@
 	if (!empty($result)) {
 		$x = 0;
 		foreach($result as $row) {
+			$list_row_url = '';
 			if (permission_exists('call_center_agent_edit')) {
 				$list_row_url = "call_center_agent_edit.php?id=".urlencode($row['call_center_agent_uuid']);
+				if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) {
+					$list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true';
+				}
 			}
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('call_center_agent_delete')) {
@@ -290,3 +294,4 @@
 	require_once "resources/footer.php";
 
 ?>
+
diff --git a/app/call_centers/call_center_queues.php b/app/call_centers/call_center_queues.php
index 76d4692f2b..52ef61e629 100644
--- a/app/call_centers/call_center_queues.php
+++ b/app/call_centers/call_center_queues.php
@@ -227,8 +227,12 @@
 	if (!empty($result)) {
 		$x = 0;
 		foreach($result as $row) {
+			$list_row_url = '';
 			if (permission_exists('call_center_queue_edit')) {
 				$list_row_url = "call_center_queue_edit.php?id=".urlencode($row['call_center_queue_uuid']);
+				if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) {
+					$list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true';
+				}
 			}
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('call_center_queue_add') || permission_exists('call_center_queue_delete')) {
@@ -293,3 +297,4 @@
 	require_once "resources/footer.php";
 
 ?>
+
diff --git a/app/call_flows/call_flows.php b/app/call_flows/call_flows.php
index 90083781d4..2cbd2d6a53 100644
--- a/app/call_flows/call_flows.php
+++ b/app/call_flows/call_flows.php
@@ -243,8 +243,12 @@
 	if (!empty($call_flows)) {
 		$x = 0;
 		foreach ($call_flows as $row) {
+			$list_row_url = '';
 			if (permission_exists('call_flow_edit')) {
 				$list_row_url = "call_flow_edit.php?id=".urlencode($row['call_flow_uuid']);
+				if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) {
+					$list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true';
+				}
 			}
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('call_flow_add') || permission_exists('call_flow_edit') || permission_exists('call_flow_delete')) {
@@ -311,3 +315,4 @@
 	require_once "resources/footer.php";
 
 ?>
+
diff --git a/app/call_forward/call_forward.php b/app/call_forward/call_forward.php
index cdb478d034..91e7d5f156 100644
--- a/app/call_forward/call_forward.php
+++ b/app/call_forward/call_forward.php
@@ -306,6 +306,9 @@
 		$x = 0;
 		foreach ($extensions as $row) {
 			$list_row_url = PROJECT_PATH . "/app/call_forward/call_forward_edit.php?id=" . $row['extension_uuid'] . "&return_url=" . urlencode($_SERVER['REQUEST_URI']);
+			if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) {
+				$list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true';
+			}
 			echo "<tr class='list-row' href='" . $list_row_url . "'>\n";
 			if (!$is_included && $extensions) {
 				echo "	<td class='checkbox'>\n";
@@ -424,3 +427,4 @@
 		require_once "resources/footer.php";
 	}
 ?>
+
diff --git a/app/conference_centers/conference_centers.php b/app/conference_centers/conference_centers.php
index b0b1038154..e5a0ab5ed2 100644
--- a/app/conference_centers/conference_centers.php
+++ b/app/conference_centers/conference_centers.php
@@ -229,8 +229,12 @@
 	if (!empty($conference_centers)) {
 		$x = 0;
 		foreach ($conference_centers as $row) {
+			$list_row_url = '';
 			if (permission_exists('conference_center_edit')) {
 				$list_row_url = "conference_center_edit.php?id=".$row['conference_center_uuid'];
+				if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) {
+					$list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true';
+				}
 			}
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('conference_center_edit') || permission_exists('conference_center_delete')) {
@@ -285,3 +289,4 @@
 	require_once "resources/footer.php";
 
 ?>
+
diff --git a/app/conference_centers/conference_rooms.php b/app/conference_centers/conference_rooms.php
index 5ce0cd55de..53d30c44e9 100644
--- a/app/conference_centers/conference_rooms.php
+++ b/app/conference_centers/conference_rooms.php
@@ -319,8 +319,12 @@
 				$participant_pin = substr($participant_pin, 0, 3) ."-".  substr($participant_pin, 3, 3) ."-". substr($participant_pin, -3)."\n";
 			}
 
+			$list_row_url = '';
 			if (permission_exists('conference_room_edit')) {
 				$list_row_url = "conference_room_edit.php?id=".urlencode($row['conference_room_uuid']);
+				if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) {
+					$list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true';
+				}
 			}
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('conference_room_add') || permission_exists('conference_room_edit') || permission_exists('conference_room_delete')) {
@@ -508,3 +512,4 @@
 	require_once "resources/footer.php";
 
 ?>
+
diff --git a/app/conferences/conferences.php b/app/conferences/conferences.php
index 159cc29475..2a112abe24 100644
--- a/app/conferences/conferences.php
+++ b/app/conferences/conferences.php
@@ -231,8 +231,12 @@
 	if (!empty($conferences)) {
 		$x = 0;
 		foreach($conferences as $row) {
+			$list_row_url = '';
 			if (permission_exists('conference_edit')) {
 				$list_row_url = "conference_edit.php?id=".urlencode($row['conference_uuid']);
+				if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) {
+					$list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true';
+				}
 			}
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('conference_add') || permission_exists('conference_edit') || permission_exists('conference_delete')) {
@@ -301,3 +305,4 @@
 	require_once "resources/footer.php";
 
 ?>
+
diff --git a/app/database_transactions/database_transactions.php b/app/database_transactions/database_transactions.php
index a04060d413..a17c6bfef6 100644
--- a/app/database_transactions/database_transactions.php
+++ b/app/database_transactions/database_transactions.php
@@ -195,8 +195,12 @@
 		$x = 0;
 		foreach($transactions as $row) {
 			if (empty($row['domain_name'])) { $row['domain_name'] = $text['label-global']; }
+			$list_row_url = '';
 			if (permission_exists('database_transaction_edit')) {
 				$list_row_url = "database_transaction_edit.php?id=".urlencode($row['database_transaction_uuid']).(!empty($page) ? "&page=".urlencode($page) : null).(!empty($search) ? "&search=".urlencode($search) : null);
+				if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) {
+					$list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true';
+				}
 			}
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			echo "	<td>".escape($row['domain_name'])."&nbsp;</td>\n";
@@ -225,3 +229,4 @@
 	require_once "resources/footer.php";
 
 ?>
+
diff --git a/app/destinations/destinations.php b/app/destinations/destinations.php
index eabcd61c09..99a0e0b4e1 100644
--- a/app/destinations/destinations.php
+++ b/app/destinations/destinations.php
@@ -375,8 +375,12 @@
 		foreach ($destinations as $row) {
 
 			//create the row link
+			$list_row_url = '';
 			if (permission_exists('destination_edit')) {
 				$list_row_url = "destination_edit.php?id=".urlencode($row['destination_uuid']);
+				if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) {
+					$list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true';
+				}
 			}
 
 			//show the data
@@ -459,3 +463,4 @@
 	require_once "resources/footer.php";
 
 ?>
+
diff --git a/app/devices/device_profiles.php b/app/devices/device_profiles.php
index 8597a26352..d9cbfe0054 100644
--- a/app/devices/device_profiles.php
+++ b/app/devices/device_profiles.php
@@ -237,8 +237,12 @@
 	if (is_array($device_profiles) && @sizeof($device_profiles) != 0) {
 		$x = 0;
 		foreach($device_profiles as $row) {
+			$list_row_url = '';
 			if (permission_exists('device_profile_edit')) {
 				$list_row_url = "device_profile_edit.php?id=".urlencode($row['device_profile_uuid']);
+				if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) {
+					$list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true';
+				}
 			}
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('device_profile_add') || permission_exists('device_profile_edit') || permission_exists('device_profile_delete')) {
@@ -298,3 +302,4 @@
 	require_once "resources/footer.php";
 
 ?>
+
diff --git a/app/devices/device_vendor_functions.php b/app/devices/device_vendor_functions.php
index 3b1e3b2b40..7a7dea5425 100644
--- a/app/devices/device_vendor_functions.php
+++ b/app/devices/device_vendor_functions.php
@@ -211,8 +211,12 @@
 				unset ($vendor_function_groups);
 
 			//show the row of data
+				$list_row_url = '';
 				if (permission_exists('device_vendor_function_edit')) {
 					$list_row_url = "device_vendor_function_edit.php?device_vendor_uuid=".urlencode($row['device_vendor_uuid'])."&id=".urlencode($row['device_vendor_function_uuid']);
+					if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) {
+						$list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true';
+					}
 				}
 				echo "<tr class='list-row' href='".$list_row_url."'>\n";
 				if (permission_exists('device_vendor_function_add') || permission_exists('device_vendor_function_edit') || permission_exists('device_vendor_function_delete')) {
@@ -289,3 +293,4 @@
 	echo "</script>\n";
 
 ?>
+
diff --git a/app/devices/device_vendors.php b/app/devices/device_vendors.php
index 9d4a24e75d..9aed554771 100644
--- a/app/devices/device_vendors.php
+++ b/app/devices/device_vendors.php
@@ -178,8 +178,12 @@
 	if (is_array($result) && @sizeof($result) != 0) {
 		$x = 0;
 		foreach($result as $row) {
+			$list_row_url = '';
 			if (permission_exists('device_vendor_edit')) {
 				$list_row_url = "device_vendor_edit.php?id=".urlencode($row['device_vendor_uuid']);
+				if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) {
+					$list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true';
+				}
 			}
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('device_vendor_edit') || permission_exists('device_vendor_delete')) {
@@ -222,3 +226,4 @@
 	require_once "resources/footer.php";
 
 ?>
+
diff --git a/app/devices/devices.php b/app/devices/devices.php
index ec56e1a667..7c251692a5 100644
--- a/app/devices/devices.php
+++ b/app/devices/devices.php
@@ -397,8 +397,12 @@
 				}
 			}
 
+			$list_row_url = '';
 			if (permission_exists('device_edit')) {
 				$list_row_url = "device_edit.php?id=".urlencode($row['device_uuid']);
+				if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) {
+					$list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true';
+				}
 			}
 
 			$device_provisioned_method = '';
@@ -473,3 +477,4 @@
 	require_once "resources/footer.php";
 
 ?>
+
diff --git a/app/dialplans/dialplans.php b/app/dialplans/dialplans.php
index 296b764c34..81c7f11b16 100644
--- a/app/dialplans/dialplans.php
+++ b/app/dialplans/dialplans.php
@@ -551,9 +551,13 @@
 		$x = 0;
 		foreach ($dialplans as $row) {
 
+			$list_row_url = '';
 			if ($row['app_uuid'] == "4b821450-926b-175a-af93-a03c441818b1") {
 				if (permission_exists('time_condition_edit') || permission_exists('dialplan_edit')) {
 					$list_row_url = PROJECT_PATH."/app/time_conditions/time_condition_edit.php?id=".urlencode($row['dialplan_uuid']).(is_uuid($app_uuid) ? "&app_uuid=".urlencode($app_uuid) : null);
+					if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) {
+						$list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true';
+					}
 				}
 			}
 			else if (
@@ -563,6 +567,9 @@
 				permission_exists('dialplan_edit')
 				) {
 				$list_row_url = "dialplan_edit.php?id=".urlencode($row['dialplan_uuid']).(is_uuid($app_uuid) ? "&app_uuid=".urlencode($app_uuid) : null);
+				if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) {
+					$list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true';
+				}
 			}
 			else {
 				unset($list_row_url);
@@ -648,3 +655,4 @@
 	require_once "resources/footer.php";
 
 ?>
+
diff --git a/app/email_queue/email_queue.php b/app/email_queue/email_queue.php
index faa6abc0c8..13e1d92e8e 100644
--- a/app/email_queue/email_queue.php
+++ b/app/email_queue/email_queue.php
@@ -337,8 +337,12 @@
 	if (is_array($email_queue) && @sizeof($email_queue) != 0) {
 		$x = 0;
 		foreach ($email_queue as $row) {
+			$list_row_url = '';
 			if (permission_exists('email_queue_edit')) {
 				$list_row_url = "email_queue_edit.php?id=".urlencode($row['email_queue_uuid']);
+				if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) {
+					$list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true';
+				}
 			}
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('email_queue_add') || permission_exists('email_queue_edit') || permission_exists('email_queue_delete')) {
diff --git a/app/email_templates/email_templates.php b/app/email_templates/email_templates.php
index ae1b22216a..36ae8687f0 100644
--- a/app/email_templates/email_templates.php
+++ b/app/email_templates/email_templates.php
@@ -257,8 +257,12 @@
 	if (!empty($result)) {
 		$x = 0;
 		foreach($result as $row) {
+			$list_row_url = '';
 			if (permission_exists('email_template_edit')) {
 				$list_row_url = "email_template_edit.php?id=".urlencode($row['email_template_uuid']);
+				if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) {
+					$list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true';
+				}
 			}
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('email_template_add') || permission_exists('email_template_edit') || permission_exists('email_template_delete')) {
@@ -323,3 +327,4 @@
 	require_once "resources/footer.php";
 
 ?>
+
diff --git a/app/event_guard/event_guard_logs.php b/app/event_guard/event_guard_logs.php
index 7e40486006..38dce4027f 100644
--- a/app/event_guard/event_guard_logs.php
+++ b/app/event_guard/event_guard_logs.php
@@ -244,8 +244,12 @@
 	if (is_array($event_guard_logs) && @sizeof($event_guard_logs) != 0) {
 		$x = 0;
 		foreach ($event_guard_logs as $row) {
+			$list_row_url = '';
 			if (permission_exists('event_guard_log_edit')) {
 				$list_row_url = "event_guard_log_edit.php?id=".urlencode($row['event_guard_log_uuid']);
+				if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) {
+					$list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true';
+				}
 			}
 			echo "<tr class='list-row'>\n";
 			if (permission_exists('event_guard_log_add') || permission_exists('event_guard_log_edit') || permission_exists('event_guard_log_delete')) {
diff --git a/app/extensions/extensions.php b/app/extensions/extensions.php
index 12eb539b7d..fac86bdfb3 100644
--- a/app/extensions/extensions.php
+++ b/app/extensions/extensions.php
@@ -339,8 +339,12 @@
 	if (is_array($extensions) && @sizeof($extensions) != 0) {
 		$x = 0;
 		foreach($extensions as $row) {
+			$list_row_url = '';
 			if (permission_exists('extension_edit')) {
 				$list_row_url = "extension_edit.php?id=".urlencode($row['extension_uuid']).(is_numeric($page) ? '&page='.urlencode($page) : null);
+				if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) {
+					$list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true';
+				}
 			}
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('extension_enabled') || permission_exists('extension_delete')) {
@@ -447,3 +451,4 @@
 	require_once "resources/footer.php";
 
 ?>
+
diff --git a/app/fax/fax.php b/app/fax/fax.php
index f87e1e63df..125a7b1305 100644
--- a/app/fax/fax.php
+++ b/app/fax/fax.php
@@ -247,8 +247,12 @@
 	if (is_array($result) && @sizeof($result) != 0) {
 		$x = 0;
 		foreach ($result as $row) {
+			$list_row_url = '';
 			if (permission_exists('fax_extension_edit')) {
 				$list_row_url = "fax_edit.php?id=".urlencode($row['fax_uuid']);
+				if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) {
+					$list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true';
+				}
 			}
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('fax_extension_add') || permission_exists('fax_extension_delete')) {
@@ -325,3 +329,4 @@
 	require_once "resources/footer.php";
 
 ?>
+
diff --git a/app/fax_queue/fax_queue.php b/app/fax_queue/fax_queue.php
index 1822255f86..5e51787f56 100644
--- a/app/fax_queue/fax_queue.php
+++ b/app/fax_queue/fax_queue.php
@@ -332,8 +332,12 @@
 	if (!empty($fax_queue)) {
 		$x = 0;
 		foreach ($fax_queue as $row) {
+			$list_row_url = '';
 			if ($permission['fax_queue_edit']) {
 				$list_row_url = "fax_queue_edit.php?id=".urlencode($row['fax_queue_uuid']);
+				if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) {
+					$list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true';
+				}
 			}
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if ($permission['fax_queue_add'] || $permission['fax_queue_edit'] || $permission['fax_queue_delete']) {
diff --git a/app/fifo/fifo.php b/app/fifo/fifo.php
index 898a333c82..54e50a05a0 100644
--- a/app/fifo/fifo.php
+++ b/app/fifo/fifo.php
@@ -264,6 +264,9 @@
 		foreach ($fifo as $row) {
 			if (permission_exists('fifo_edit')) {
 				$list_row_url = "fifo_edit.php?id=".urlencode($row['fifo_uuid']);
+				if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) {
+					$list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true';
+				}
 			}
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('fifo_add') || permission_exists('fifo_edit') || permission_exists('fifo_delete')) {
@@ -320,3 +323,4 @@
 	require_once "resources/footer.php";
 
 ?>
+
diff --git a/app/gateways/gateways.php b/app/gateways/gateways.php
index cd6299c25f..06f3a7bcc7 100644
--- a/app/gateways/gateways.php
+++ b/app/gateways/gateways.php
@@ -286,8 +286,12 @@
 	if (!empty($gateways)) {
 		$x = 0;
 		foreach($gateways as $row) {
+			$list_row_url = '';
 			if (permission_exists('gateway_edit')) {
 				$list_row_url = "gateway_edit.php?id=".urlencode($row['gateway_uuid']);
+				if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) {
+					$list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true';
+				}
 			}
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('gateway_add') || permission_exists('gateway_edit') || permission_exists('gateway_delete')) {
@@ -391,3 +395,4 @@
 	require_once "resources/footer.php";
 
 ?>
+
diff --git a/app/ivr_menus/ivr_menus.php b/app/ivr_menus/ivr_menus.php
index 2c4968369d..287a2a66f5 100644
--- a/app/ivr_menus/ivr_menus.php
+++ b/app/ivr_menus/ivr_menus.php
@@ -236,8 +236,12 @@
 	if (!empty($ivr_menus)) {
 		$x = 0;
 		foreach($ivr_menus as $row) {
+			$list_row_url = '';
 			if (permission_exists('ivr_menu_edit')) {
 				$list_row_url = "ivr_menu_edit.php?id=".urlencode($row['ivr_menu_uuid']);
+				if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) {
+					$list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true';
+				}
 			}
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('ivr_menu_add') || permission_exists('ivr_menu_edit') || permission_exists('ivr_menu_delete')) {
@@ -298,3 +302,4 @@
 	require_once "resources/footer.php";
 
 ?>
+
diff --git a/app/modules/modules.php b/app/modules/modules.php
index f2ec07b185..bb3a16a2dc 100644
--- a/app/modules/modules.php
+++ b/app/modules/modules.php
@@ -202,8 +202,12 @@
 					echo "</tr>\n";
 					write_header($row["module_category"]);
 				}
+			$list_row_url = '';
 			if (permission_exists('module_edit')) {
 				$list_row_url = "module_edit.php?id=".urlencode($row['module_uuid']);
+				if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) {
+					$list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true';
+				}
 			}
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('module_edit') || permission_exists('module_delete')) {
@@ -283,3 +287,4 @@
 	require_once "resources/footer.php";
 
 ?>
+
diff --git a/app/number_translations/number_translations.php b/app/number_translations/number_translations.php
index bc02e4fef8..3b58216bf3 100644
--- a/app/number_translations/number_translations.php
+++ b/app/number_translations/number_translations.php
@@ -225,8 +225,12 @@
 	if (!empty($number_translations)) {
 		$x = 0;
 		foreach ($number_translations as $row) {
+			$list_row_url = '';
 			if (permission_exists('number_translation_edit')) {
 				$list_row_url = "number_translation_edit.php?id=".urlencode($row['number_translation_uuid']);
+				if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) {
+					$list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true';
+				}
 			}
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('number_translation_add') || permission_exists('number_translation_edit') || permission_exists('number_translation_delete')) {
@@ -276,3 +280,4 @@
 	require_once "resources/footer.php";
 
 ?>
+
diff --git a/app/phrases/phrases.php b/app/phrases/phrases.php
index e8b5bd16ab..0edd4f6559 100644
--- a/app/phrases/phrases.php
+++ b/app/phrases/phrases.php
@@ -211,8 +211,12 @@
 	if (is_array($phrases) && @sizeof($phrases) != 0) {
 		$x = 0;
 		foreach($phrases as $row) {
+			$list_row_url = '';
 			if (permission_exists('phrase_edit')) {
 				$list_row_url = "phrase_edit.php?id=".urlencode($row['phrase_uuid']);
+				if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) {
+					$list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true';
+				}
 			}
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('phrase_add') || permission_exists('phrase_edit') || permission_exists('phrase_delete')) {
@@ -273,3 +277,4 @@
 	require_once "resources/footer.php";
 
 ?>
+
diff --git a/app/pin_numbers/pin_numbers.php b/app/pin_numbers/pin_numbers.php
index 1740c631a2..e7581cecf7 100644
--- a/app/pin_numbers/pin_numbers.php
+++ b/app/pin_numbers/pin_numbers.php
@@ -189,8 +189,12 @@
 	if (is_array($pin_numbers) && @sizeof($pin_numbers) != 0) {
 		$x = 0;
 		foreach ($pin_numbers as $row) {
+			$list_row_url = '';
 			if (permission_exists('pin_number_edit')) {
 				$list_row_url = "pin_number_edit.php?id=".urlencode($row['pin_number_uuid']);
+				if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) {
+					$list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true';
+				}
 			}
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('pin_number_add') || permission_exists('pin_number_edit') || permission_exists('pin_number_delete')) {
@@ -241,3 +245,4 @@
 	require_once "resources/footer.php";
 
 ?>
+
diff --git a/app/recordings/recordings.php b/app/recordings/recordings.php
index b429120270..0a8f68b13b 100644
--- a/app/recordings/recordings.php
+++ b/app/recordings/recordings.php
@@ -529,8 +529,12 @@
 				echo "<tr class='list-row' id='recording_progress_bar_".escape($row['recording_uuid'])."' onclick=\"recording_seek(event,'".escape($row['recording_uuid'] ?? '')."')\" style='display: none;'><td id='playback_progress_bar_background_".escape($row['recording_uuid'])."' class='playback_progress_bar_background' style='padding: 0; border: none;' colspan='".$col_count."'><span class='playback_progress_bar' id='recording_progress_".escape($row['recording_uuid'])."'></span></td></tr>\n";
 				echo "<tr class='list-row' style='display: none;'><td></td></tr>\n"; // dummy row to maintain alternating background color
 			}
+			$list_row_url = '';
 			if (permission_exists('recording_edit')) {
 				$list_row_url = "recording_edit.php?id=".urlencode($row['recording_uuid']);
+				if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) {
+					$list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true';
+				}
 			}
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('recording_delete')) {
@@ -710,3 +714,4 @@
 	}
 
 ?>
+
diff --git a/app/ring_groups/ring_groups.php b/app/ring_groups/ring_groups.php
index 59473180d1..f995d7cdf0 100644
--- a/app/ring_groups/ring_groups.php
+++ b/app/ring_groups/ring_groups.php
@@ -257,8 +257,12 @@
 	if (is_array($ring_groups) && @sizeof($ring_groups) != 0) {
 		$x = 0;
 		foreach ($ring_groups as $row) {
+			$list_row_url = '';
 			if (permission_exists('ring_group_edit')) {
 				$list_row_url = "ring_group_edit.php?id=".urlencode($row['ring_group_uuid']);
+				if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) {
+					$list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true';
+				}
 			}
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('ring_group_add') || permission_exists('ring_group_edit') || permission_exists('ring_group_delete')) {
@@ -315,3 +319,4 @@
 	require_once "resources/footer.php";
 
 ?>
+
diff --git a/app/sip_profiles/sip_profiles.php b/app/sip_profiles/sip_profiles.php
index a18b92c5e5..956d0727ea 100644
--- a/app/sip_profiles/sip_profiles.php
+++ b/app/sip_profiles/sip_profiles.php
@@ -188,8 +188,12 @@
 	if (!empty($sip_profiles) && @sizeof($sip_profiles) != 0) {
 		$x = 0;
 		foreach ($sip_profiles as $row) {
+			$list_row_url = '';
 			if (permission_exists('sip_profile_edit')) {
 				$list_row_url = "sip_profile_edit.php?id=".urlencode($row['sip_profile_uuid']);
+				if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) {
+					$list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true';
+				}
 			}
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('sip_profile_add') || permission_exists('sip_profile_edit') || permission_exists('sip_profile_delete')) {
@@ -239,3 +243,4 @@
 	require_once "resources/footer.php";
 
 ?>
+
diff --git a/app/sip_status/sip_status.php b/app/sip_status/sip_status.php
index 364023a108..5dfb85360e 100644
--- a/app/sip_status/sip_status.php
+++ b/app/sip_status/sip_status.php
@@ -331,3 +331,4 @@
 	require_once "resources/footer.php";
 
 ?>
+
diff --git a/app/sofia_global_settings/sofia_global_settings.php b/app/sofia_global_settings/sofia_global_settings.php
index deb31716d5..12a40fb1ec 100644
--- a/app/sofia_global_settings/sofia_global_settings.php
+++ b/app/sofia_global_settings/sofia_global_settings.php
@@ -209,8 +209,12 @@
 	if (!empty($sofia_global_settings) && @sizeof($sofia_global_settings) != 0) {
 		$x = 0;
 		foreach ($sofia_global_settings as $row) {
+			$list_row_url = '';
 			if (permission_exists('sofia_global_setting_edit')) {
 				$list_row_url = "sofia_global_setting_edit.php?id=".urlencode($row['sofia_global_setting_uuid']);
+				if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) {
+					$list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true';
+				}
 			}
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('sofia_global_setting_add') || permission_exists('sofia_global_setting_edit') || permission_exists('sofia_global_setting_delete')) {
@@ -261,3 +265,4 @@
 	require_once "resources/footer.php";
 
 ?>
+
diff --git a/app/streams/streams.php b/app/streams/streams.php
index 5b872b764a..c065cad90b 100644
--- a/app/streams/streams.php
+++ b/app/streams/streams.php
@@ -248,8 +248,12 @@
 	if (!empty($streams)) {
 		$x = 0;
 		foreach ($streams as $row) {
+			$list_row_url = '';
 			if (permission_exists('stream_edit')) {
 				$list_row_url = "stream_edit.php?id=".urlencode($row['stream_uuid']);
+				if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) {
+					$list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true';
+				}
 			}
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('stream_add') || permission_exists('stream_edit') || permission_exists('stream_delete')) {
@@ -315,3 +319,4 @@
 	require_once "resources/footer.php";
 
 ?>
+
diff --git a/app/time_conditions/time_conditions.php b/app/time_conditions/time_conditions.php
index 63c826305e..6f5eede525 100644
--- a/app/time_conditions/time_conditions.php
+++ b/app/time_conditions/time_conditions.php
@@ -218,8 +218,12 @@
 	if (is_array($dialplans) && @sizeof($dialplans) != 0) {
 		$x = 0;
 		foreach ($dialplans as $row) {
+			$list_row_url = '';
 			if (permission_exists('time_condition_edit')) {
 				$list_row_url = "time_condition_edit.php?id=".urlencode($row['dialplan_uuid']);
+				if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) {
+					$list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true';
+				}
 			}
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('time_condition_add') || permission_exists('time_condition_edit') || permission_exists('time_condition_delete')) {
@@ -282,3 +286,4 @@
 	require_once "resources/footer.php";
 
 ?>
+
diff --git a/app/vars/vars.php b/app/vars/vars.php
index d954ff394d..3e17ca5a23 100644
--- a/app/vars/vars.php
+++ b/app/vars/vars.php
@@ -224,8 +224,12 @@
 					echo "</tr>\n";
 					write_header($row["var_category"]);
 				}
+			$list_row_url = '';
 			if (permission_exists('var_edit')) {
 				$list_row_url = "var_edit.php?id=".urlencode($row['var_uuid']);
+				if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) {
+					$list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true';
+				}
 			}
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('var_add') || permission_exists('var_edit') || permission_exists('var_delete')) {
@@ -283,3 +287,4 @@
 	require_once "resources/footer.php";
 
 ?>
+
diff --git a/app/voicemail_greetings/voicemail_greetings.php b/app/voicemail_greetings/voicemail_greetings.php
index 93a5674dac..49eec2c8bb 100644
--- a/app/voicemail_greetings/voicemail_greetings.php
+++ b/app/voicemail_greetings/voicemail_greetings.php
@@ -437,8 +437,12 @@
 				echo "<tr class='list-row' id='recording_progress_bar_".escape($row['voicemail_greeting_uuid'])."' onclick=\"recording_seek(event,'".escape($row['voicemail_greeting_uuid'])."')\" style='display: none;'><td id='playback_progress_bar_background_".escape($row['voicemail_greeting_uuid'])."' class='playback_progress_bar_background' style='padding: 0; border: none;' colspan='".$col_count."'><span class='playback_progress_bar' id='recording_progress_".escape($row['voicemail_greeting_uuid'])."'></span></td></tr>\n";
 				echo "<tr class='list-row' style='display: none;'><td></td></tr>\n"; // dummy row to maintain alternating background color
 			}
+			$list_row_url = '';
 			if (permission_exists('voicemail_greeting_edit')) {
 				$list_row_url = "voicemail_greeting_edit.php?id=".urlencode($row['voicemail_greeting_uuid'])."&voicemail_id=".urlencode($voicemail_id);
+				if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) {
+					$list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true';
+				}
 			}
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('voicemail_greeting_delete')) {
@@ -605,3 +609,4 @@
 	}
 
 ?>
+
diff --git a/app/voicemails/voicemails.php b/app/voicemails/voicemails.php
index 250e0b7160..ad6d6c1903 100644
--- a/app/voicemails/voicemails.php
+++ b/app/voicemails/voicemails.php
@@ -297,8 +297,12 @@
 	if (is_array($voicemails) && sizeof($voicemails) != 0) {
 		$x = 0;
 		foreach ($voicemails as $row) {
+			$list_row_url = '';
 			if (permission_exists('voicemail_edit')) {
 				$list_row_url = "voicemail_edit.php?id=".urlencode($row['voicemail_uuid']);
+				if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) {
+					$list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true';
+				}
 			}
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('voicemail_edit') || permission_exists('voicemail_delete')) {
@@ -373,3 +377,4 @@
 //include the footer
 	require_once "resources/footer.php";
 
+
diff --git a/app/xml_cdr/xml_cdr.php b/app/xml_cdr/xml_cdr.php
index 2b59f228a3..68669d90a8 100644
--- a/app/xml_cdr/xml_cdr.php
+++ b/app/xml_cdr/xml_cdr.php
@@ -877,8 +877,12 @@
 						$content .= "<tr class='list-row' id='recording_progress_bar_".$row['xml_cdr_uuid']."' style='display: none;' onclick=\"recording_seek(event,'".escape($row['xml_cdr_uuid'])."')\"><td id='playback_progress_bar_background_".escape($row['xml_cdr_uuid'])."' class='playback_progress_bar_background' colspan='".$col_count."'><span class='playback_progress_bar' id='recording_progress_".$row['xml_cdr_uuid']."'></span></td></tr>\n";
 						$content .= "<tr class='list-row' style='display: none;'><td></td></tr>\n"; // dummy row to maintain alternating background color
 					}
+					$list_row_url = '';
 					if ($permission['xml_cdr_details']) {
 						$list_row_url = "xml_cdr_details.php?id=".urlencode($row['xml_cdr_uuid']).($_REQUEST['show'] ? "&show=all" : null);
+						if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) {
+							$list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true';
+						}
 					}
 					$content .= "<tr class='list-row' href='".$list_row_url."'>\n";
 					if (!$archive_request && $permission['xml_cdr_delete']) {
@@ -1059,3 +1063,4 @@
 	require_once "resources/footer.php";
 
 ?>
+
diff --git a/core/contacts/contact_addresses.php b/core/contacts/contact_addresses.php
index 7d17fd0180..8e375a3480 100644
--- a/core/contacts/contact_addresses.php
+++ b/core/contacts/contact_addresses.php
@@ -88,8 +88,12 @@
 				$x = 0;
 				foreach ($contact_addresses as $row) {
 					$map_query = $row['address_street']." ".$row['address_extended'].", ".$row['address_locality'].", ".$row['address_region'].", ".$row['address_region'].", ".$row['address_postal_code'];
+					$list_row_url = '';
 					if (permission_exists('contact_address_edit')) {
 						$list_row_url = "contact_address_edit.php?contact_uuid=".urlencode($row['contact_uuid'])."&id=".urlencode($row['contact_address_uuid']);
+						if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) {
+							$list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true';
+						}
 					}
 					echo "<tr class='list-row' href='".$list_row_url."'>\n";
 					if (permission_exists('contact_address_delete')) {
@@ -123,3 +127,4 @@
 	}
 
 ?>
+
diff --git a/core/contacts/contact_attachments.php b/core/contacts/contact_attachments.php
index 7986b3fbb7..8b2c913c78 100644
--- a/core/contacts/contact_attachments.php
+++ b/core/contacts/contact_attachments.php
@@ -107,8 +107,12 @@
 				foreach ($contact_attachments as $row) {
 					$attachment_type = strtolower(pathinfo($row['attachment_filename'], PATHINFO_EXTENSION));
 					$attachment_type_label = $attachment_type == 'jpg' || $attachment_type == 'jpeg' || $attachment_type == 'gif' || $attachment_type == 'png' ? $text['label-image'] : $text['label-file'];
+					$list_row_url = '';
 					if (permission_exists('contact_attachment_edit')) {
 						$list_row_url = "contact_attachment_edit.php?contact_uuid=".urlencode($row['contact_uuid'])."&id=".urlencode($row['contact_attachment_uuid']);
+						if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) {
+							$list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true';
+						}
 					}
 					echo "<tr class='list-row' href='".$list_row_url."'>\n";
 					if (permission_exists('contact_attachment_delete')) {
@@ -147,3 +151,4 @@
 	}
 
 ?>
+
diff --git a/core/contacts/contact_emails.php b/core/contacts/contact_emails.php
index c89e9da80b..6afcb02539 100644
--- a/core/contacts/contact_emails.php
+++ b/core/contacts/contact_emails.php
@@ -79,8 +79,12 @@
 			if (!empty($contact_emails)) {
 				$x = 0;
 				foreach ($contact_emails as $row) {
+					$list_row_url = '';
 					if (permission_exists('contact_email_edit')) {
 						$list_row_url = "contact_email_edit.php?contact_uuid=".urlencode($row['contact_uuid'])."&id=".urlencode($row['contact_email_uuid']);
+						if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) {
+							$list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true';
+						}
 					}
 					echo "<tr class='list-row' href='".$list_row_url."'>\n";
 					if (permission_exists('contact_email_delete')) {
@@ -110,3 +114,4 @@
 	}
 
 ?>
+
diff --git a/core/contacts/contact_extensions.php b/core/contacts/contact_extensions.php
index 96678d5e8f..a848bd0976 100644
--- a/core/contacts/contact_extensions.php
+++ b/core/contacts/contact_extensions.php
@@ -77,8 +77,12 @@
 			if (!empty($contact_extensions)) {
 				$x = 0;
 				foreach ($contact_extensions as $row) {
+					$list_row_url = '';
 					if (permission_exists('extension_edit')) {
 						$list_row_url = PROJECT_PATH.'/app/extensions/extension_edit.php?id='.urlencode($row['extension_uuid']);
+						if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) {
+							$list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true';
+						}
 					}
 					echo "<tr class='list-row' href='".$list_row_url."' ".($row['url_primary'] ? "style='font-weight: bold;'" : null).">\n";
 					echo "	<td>";
@@ -109,3 +113,4 @@
 	}
 
 ?>
+
diff --git a/core/contacts/contact_notes.php b/core/contacts/contact_notes.php
index 07d45b94db..0e66f265ec 100644
--- a/core/contacts/contact_notes.php
+++ b/core/contacts/contact_notes.php
@@ -82,8 +82,12 @@
 					$contact_note = $row['contact_note'];
 					$contact_note = escape($contact_note);
 					$contact_note = str_replace("\n","<br />",$contact_note);
+					$list_row_url = '';
 					if (permission_exists('contact_note_add')) {
 						$list_row_url = "contact_note_edit.php?contact_uuid=".escape($row['contact_uuid'])."&id=".escape($row['contact_note_uuid']);
+						if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) {
+							$list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true';
+						}
 					}
 					echo "<tr class='list-row' href='".$list_row_url."'>\n";
 					if (permission_exists('contact_note_delete')) {
@@ -112,3 +116,4 @@
 	}
 
 ?>
+
diff --git a/core/contacts/contact_phones.php b/core/contacts/contact_phones.php
index b70759f153..51d18b2c14 100644
--- a/core/contacts/contact_phones.php
+++ b/core/contacts/contact_phones.php
@@ -93,8 +93,12 @@
 			if (!empty($contact_phones)) {
 				$x = 0;
 				foreach ($contact_phones as $row) {
+					$list_row_url = '';
 					if (permission_exists('contact_phone_edit')) {
 						$list_row_url = "contact_phone_edit.php?contact_uuid=".urlencode($row['contact_uuid'])."&id=".urlencode($row['contact_phone_uuid']);
+						if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) {
+							$list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true';
+						}
 					}
 					echo "<tr class='list-row' href='".$list_row_url."'>\n";
 					if (permission_exists('contact_phone_delete')) {
@@ -144,3 +148,4 @@
 	}
 
 ?>
+
diff --git a/core/contacts/contact_relations.php b/core/contacts/contact_relations.php
index 01e2c77779..36e006cf8b 100644
--- a/core/contacts/contact_relations.php
+++ b/core/contacts/contact_relations.php
@@ -93,8 +93,12 @@
 			if (!empty($contact_relations)) {
 				$x = 0;
 				foreach ($contact_relations as $row) {
+					$list_row_url = '';
 					if (permission_exists('contact_relation_edit')) {
 						$list_row_url = "contact_relation_edit.php?contact_uuid=".urlencode($contact_uuid)."&id=".urlencode($row['contact_relation_uuid']);
+						if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) {
+							$list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true';
+						}
 					}
 					echo "<tr class='list-row' href='".$list_row_url."'>\n";
 					if (permission_exists('contact_relation_delete')) {
@@ -124,3 +128,4 @@
 	}
 
 ?>
+
diff --git a/core/contacts/contact_settings.php b/core/contacts/contact_settings.php
index 0fa2d63a3b..6ded1b022a 100644
--- a/core/contacts/contact_settings.php
+++ b/core/contacts/contact_settings.php
@@ -86,8 +86,12 @@
 			if (!empty($contact_settings)) {
 				$x = 0;
 				foreach ($contact_settings as $row) {
+					$list_row_url = '';
 					if (permission_exists('contact_setting_edit')) {
 						$list_row_url = "contact_setting_edit.php?contact_uuid=".urlencode($contact_uuid)."&id=".urlencode($row['contact_setting_uuid']);
+						if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) {
+							$list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true';
+						}
 					}
 					echo "<tr class='list-row' href='".$list_row_url."'>\n";
 					if (permission_exists('contact_setting_delete')) {
@@ -133,3 +137,4 @@
 	}
 
 ?>
+
diff --git a/core/contacts/contact_times.php b/core/contacts/contact_times.php
index 1ab5fcf912..193fa0f911 100644
--- a/core/contacts/contact_times.php
+++ b/core/contacts/contact_times.php
@@ -97,8 +97,12 @@
 					}
 					$tmp = explode(' ', $row['time_start']);
 					$time_start = $tmp[0];
+					$list_row_url = '';
 					if (permission_exists('contact_time_edit')) {
 						$list_row_url = "contact_time_edit.php?contact_uuid=".urlencode($row['contact_uuid'])."&id=".urlencode($row['contact_time_uuid']);
+						if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) {
+							$list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true';
+						}
 					}
 					echo "<tr class='list-row' href='".$list_row_url."'>\n";
 					if (permission_exists('contact_time_delete')) {
@@ -129,3 +133,4 @@
 	}
 
 ?>
+
diff --git a/core/contacts/contact_urls.php b/core/contacts/contact_urls.php
index d04d70cbb5..7de4cb087d 100644
--- a/core/contacts/contact_urls.php
+++ b/core/contacts/contact_urls.php
@@ -81,8 +81,12 @@
 			if (!empty($contact_urls)) {
 				$x = 0;
 				foreach ($contact_urls as $row) {
+					$list_row_url = '';
 					if (permission_exists('contact_url_edit')) {
 						$list_row_url = "contact_url_edit.php?contact_uuid=".urlencode($row['contact_uuid'])."&id=".urlencode($row['contact_url_uuid']);
+						if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) {
+							$list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true';
+						}
 					}
 					echo "<tr class='list-row' href='".$list_row_url."'>\n";
 					if (permission_exists('contact_url_delete')) {
@@ -112,3 +116,4 @@
 	}
 
 ?>
+
diff --git a/core/contacts/contacts.php b/core/contacts/contacts.php
index f35857b5bc..abdbdbfe2f 100644
--- a/core/contacts/contacts.php
+++ b/core/contacts/contacts.php
@@ -396,6 +396,9 @@
 		$x = 0;
 		foreach($contacts as $row) {
 			$list_row_url = "contact_view.php?id=".urlencode($row['contact_uuid'])."&query_string=".urlencode($_SERVER["QUERY_STRING"]);
+			if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) {
+				$list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true';
+			}
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('contact_delete')) {
 				echo "	<td class='checkbox'>\n";
@@ -469,3 +472,5 @@
 	require_once "resources/footer.php";
 
 ?>
+
+
diff --git a/core/dashboard/dashboard.php b/core/dashboard/dashboard.php
index 7d3076b9dd..841a95ce4f 100644
--- a/core/dashboard/dashboard.php
+++ b/core/dashboard/dashboard.php
@@ -202,8 +202,12 @@
 	if (!empty($dashboard)) {
 		$x = 0;
 		foreach ($dashboard as $row) {
+			$list_row_url = '';
 			if (permission_exists('dashboard_edit')) {
 				$list_row_url = "dashboard_edit.php?id=".urlencode($row['dashboard_uuid']);
+				if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) {
+					$list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true';
+				}
 			}
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('dashboard_add') || permission_exists('dashboard_edit') || permission_exists('dashboard_delete')) {
@@ -256,3 +260,4 @@
 	require_once "resources/footer.php";
 
 ?>
+
diff --git a/core/databases/databases.php b/core/databases/databases.php
index 9e5280ebb6..a579b486ef 100644
--- a/core/databases/databases.php
+++ b/core/databases/databases.php
@@ -200,3 +200,4 @@
 	require_once "resources/footer.php";
 
 ?>
+
diff --git a/core/users/users.php b/core/users/users.php
index cffbe80a8e..304f6a3d32 100644
--- a/core/users/users.php
+++ b/core/users/users.php
@@ -276,8 +276,12 @@
 	if (is_array($users) && @sizeof($users) != 0) {
 		$x = 0;
 		foreach ($users as $row) {
+			$list_row_url = '';
 			if (permission_exists('user_edit')) {
 				$list_row_url = "user_edit.php?id=".urlencode($row['user_uuid']);
+				if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) {
+					$list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true';
+				}
 			}
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('user_add') || permission_exists('user_edit') || permission_exists('user_delete')) {
@@ -337,3 +341,4 @@
 	require_once "resources/footer.php";
 
 ?>
+

From 3adcad3e5e3b197292b22d7eca0ec6f7cc392875 Mon Sep 17 00:00:00 2001
From: chansizzle <14916599+chansizzle@users.noreply.github.com>
Date: Thu, 20 Feb 2025 21:28:22 -0700
Subject: [PATCH 36/55] date column before time column (#7266)

change the order of the columns
---
 app/emergency/emergency.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/emergency/emergency.php b/app/emergency/emergency.php
index 899abb3f4e..6452043b3c 100644
--- a/app/emergency/emergency.php
+++ b/app/emergency/emergency.php
@@ -189,8 +189,8 @@ echo "<tr class='list-header'>\n";
 if (!empty($show) && $show == 'all' && permission_exists('emergency_logs_view_all')) {
 	echo th_order_by('domain_name', $text['label-domain'], $order_by, $order);
 }
-echo "<th class='left'>".$text['label-emergency_time']."</th>\n";
 echo "<th class='left'>".$text['label-emergency_date']."</th>\n";
+echo "<th class='left'>".$text['label-emergency_time']."</th>\n";
 echo "<th class='left'>".$text['label-emergency_extension']."</th>\n";
 echo "<th class='left'>".$text['label-emergency_event']."</th>\n";
 echo "</tr>\n";
@@ -202,8 +202,8 @@ if (!empty($emergency_logs) && is_array($emergency_logs) && @sizeof($emergency_l
 		if (!empty($_GET['show']) && $_GET['show'] == 'all' && permission_exists('emergency_logs_view_all')) {
 			echo "	<td>".escape($_SESSION['domains'][$row['domain_uuid']]['domain_name'])."</td>\n";
 		}
-		echo "	<td>".escape($row['time_formatted'])."</td>\n";
 		echo "	<td>".escape($row['date_formatted'])."</td>\n";
+		echo "	<td>".escape($row['time_formatted'])."</td>\n";
 		echo "	<td>".escape($row['extension'])."</td>\n";
 		echo "	<td>".escape($row['event'])."</td>\n";
 		echo "</tr>\n";

From b85eaaac73f37fdb63e8b3d3dd2f1d1c46d2781d Mon Sep 17 00:00:00 2001
From: fusionate <nate@fusionpbx.com>
Date: Fri, 21 Feb 2025 08:51:52 -0700
Subject: [PATCH 37/55] Upgrade - Source: Move Preview styles to theme CSS
 file, style after modal.

---
 core/upgrade/index.php | 33 ++----------------------------
 themes/default/css.php | 46 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 31 deletions(-)

diff --git a/core/upgrade/index.php b/core/upgrade/index.php
index f9ed6c7c77..eb56ed9fce 100644
--- a/core/upgrade/index.php
+++ b/core/upgrade/index.php
@@ -221,12 +221,12 @@
 				}
 			}
 			echo "<button type='button' class='btn btn-default' style='float: right;' onclick=\"$('#source_preview_layer').fadeOut(200);\">".$text['button-close']."</button>\n";
-			echo "<b>".$text['header-source_code_upgrade_preview']."</b>\n";
+			echo "<div class='title'>".$text['header-source_code_upgrade_preview']."</div>\n";
 			echo "<br><br>\n";
 			if (!empty($response) && is_array($response)) {
 				echo str_replace('APP_NAME', (!empty($_GET['title']) ? "<strong>".$_GET['title']."</strong>" : null), $text['description-source_code_changes_found']);
 				echo "<br><br><br>\n";
-				echo "<div style='width: 100%; max-height: 250px; overflow: auto; border: 1px solid ".($_SESSION['theme']['table_row_border_color']['text'] ?? '#c5d1e5')."; padding: 12px 15px; background-color: ".($_SESSION['theme']['table_row_background_color_light']['text'] ?? '#fff')."; font-family: monospace; font-size: 85%; color: green;'>\n";
+				echo "<div class='file_paths'>\n";
 				if (!empty($response) && is_array($response)) {
 					echo implode("<br>\n<hr style='margin: 3px 0;'>\n", $response);
 				}
@@ -254,35 +254,6 @@
 	require_once "resources/header.php";
 
 //source preview layer
-	echo "<style>\n";
-	echo "	#source_preview_layer {\n";
-	echo "		z-index: 999999;\n";
-	echo "		position: absolute;\n";
-	echo "		left: 0px;\n";
-	echo "		top: 0px;\n";
-	echo "		right: 0px;\n";
-	echo "		bottom: 0px;\n";
-	echo "		text-align: center;\n";
-	echo "		vertical-align: middle;\n";
-	echo "		}\n";
-	echo "	#source_preview_container {\n";
-	echo "		display: block;\n";
-	echo "		overflow: auto;\n";
-	echo "		background-color: #fff;\n";
-	echo "		padding: 25px 25px;\n";
-	if (http_user_agent('mobile')) {
-		echo "	margin: 0;\n";
-	}
-	else {
-		echo "	margin: auto 10%;\n";
-	}
-	echo "		text-align: left;\n";
-	echo "		-webkit-box-shadow: 0px 1px 20px #888;\n";
-	echo "		-moz-box-shadow: 0px 1px 20px #888;\n";
-	echo "		box-shadow: 0px 1px 20px #888;\n";
-	echo "		}\n";
-	echo "</style>\n";
-
 	echo "<div id='source_preview_layer' style='display: none;'>\n";
 	echo "	<table cellpadding='0' cellspacing='0' border='0' width='100%' height='100%'>\n";
 	echo "		<tr>\n";
diff --git a/themes/default/css.php b/themes/default/css.php
index 5437f172ed..c3f0b40cb4 100644
--- a/themes/default/css.php
+++ b/themes/default/css.php
@@ -3854,6 +3854,52 @@ else { //default: white
 		text-align: left;
 		}
 
+/* UPGRADE - SOURCE CODE PREVIEW ************************************************/
+
+	#source_preview_layer {
+		z-index: 999999;
+		position: absolute;
+		left: 0px;
+		top: 0px;
+		right: 0px;
+		bottom: 0px;
+		text-align: center;
+		vertical-align: middle;
+		}
+
+	#source_preview_container {
+		display: block;
+		overflow: auto;
+		background-color: <?=$modal_background_color?>;
+		padding: 25px 25px;
+		margin: auto 10%;
+		text-align: left;
+		box-shadow: <?=$modal_shadow?>;
+		border-radius: <?=$modal_corner_radius?>;
+		color: <?=$modal_message_color?>;
+		}
+
+	#source_preview_container div.title {
+		display: block;
+		font-weight: bold;
+		font-size: 120%;
+		font-family: <?=$modal_title_font?>;
+		color: <?=$modal_title_color?>;
+		text-align: <?=$modal_title_alignment?>;
+		margin: <?=$modal_title_margin?>;
+		}
+
+	#source_preview_container div.file_paths {
+		width: 100%;
+		max-height: 250px;
+		overflow: auto;
+		border: 1px solid <?=$table_row_border_color?>;
+		padding: 12px 15px;
+		background-color: <?=$table_row_background_color_light?>;
+		font-family: monospace; font-size: 85%;
+		color: green;
+		}
+
 /* ACE EDITOR *******************************************************************/
 
 	div#editor {

From d78c726d9b869df640a2c66c1e934bc7c84a37b2 Mon Sep 17 00:00:00 2001
From: Alex <40072887+alexdcrane@users.noreply.github.com>
Date: Fri, 21 Feb 2025 10:23:46 -0700
Subject: [PATCH 38/55] Fix call forward show all button (#7267)

---
 app/call_forward/call_forward.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/call_forward/call_forward.php b/app/call_forward/call_forward.php
index 91e7d5f156..45c6c2abbd 100644
--- a/app/call_forward/call_forward.php
+++ b/app/call_forward/call_forward.php
@@ -241,7 +241,7 @@
 			}
 		}
 		if ($show !== 'all' && permission_exists('call_forward_all')) {
-			echo button::create(['type' => 'button', 'label' => $text['button-show_all'], 'icon' => $_SESSION['theme']['button_icon_all'], 'link' => '?show=all' . $param]);
+			echo button::create(['type' => 'button', 'label' => $text['button-show_all'], 'icon' => $_SESSION['theme']['button_icon_all'], 'link' => '?show=all' . (!empty($params) ? '&'.implode('&', $params) : null)]);
 		}
 		echo "<form id='form_search' class='inline' method='get'>\n";
 		if ($show == 'all' && permission_exists('call_forward_all')) {
@@ -427,4 +427,3 @@
 		require_once "resources/footer.php";
 	}
 ?>
-

From 7707b9853cfebf0627924e70cbff613b2d64292a Mon Sep 17 00:00:00 2001
From: Alex <40072887+alexdcrane@users.noreply.github.com>
Date: Fri, 21 Feb 2025 10:58:53 -0700
Subject: [PATCH 39/55] Fix bridges redirect to correct domain when using show
 all (#7269)

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

diff --git a/app/bridges/bridges.php b/app/bridges/bridges.php
index ce706932a3..95cf85dcef 100644
--- a/app/bridges/bridges.php
+++ b/app/bridges/bridges.php
@@ -126,7 +126,7 @@
 	$offset = $rows_per_page * $page;
 
 //get the list
-	$sql = "select b.bridge_uuid, d.domain_name, b.bridge_name, b.bridge_destination, bridge_enabled, bridge_description ";
+	$sql = "select d.domain_uuid, b.bridge_uuid, d.domain_name, b.bridge_name, b.bridge_destination, bridge_enabled, bridge_description ";
 	$sql .= "from v_bridges as b, v_domains as d ";
 	$sql .= "where b.domain_uuid = d.domain_uuid ";
 	if (!empty($show) && $show == "all" && permission_exists('bridge_all')) {

From eb26156159822fc6694e71b43d3117cb45168af8 Mon Sep 17 00:00:00 2001
From: FusionPBX <mark@fusionpbx.com>
Date: Fri, 21 Feb 2025 13:16:11 -0700
Subject: [PATCH 40/55] Remove the !empty(voicemail_mail_to) condition

The toggle for keeps local after email harms nothing. So we don't need to restrict it.
---
 app/voicemails/voicemail_edit.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/voicemails/voicemail_edit.php b/app/voicemails/voicemail_edit.php
index 1da52e957e..083c525d59 100644
--- a/app/voicemails/voicemail_edit.php
+++ b/app/voicemails/voicemail_edit.php
@@ -177,7 +177,7 @@
 					if (permission_exists('voicemail_file')) {
 						$array['voicemails'][0]['voicemail_file'] = $voicemail_file;
 					}
-					if (permission_exists('voicemail_local_after_email') && !empty($voicemail_mail_to)) {
+					if (permission_exists('voicemail_local_after_email')) {
 						$array['voicemails'][0]['voicemail_local_after_email'] = $voicemail_local_after_email ?? 'false';
 					}
 					$array['voicemails'][0]['voicemail_enabled'] = $voicemail_enabled;
@@ -874,10 +874,7 @@
 		echo "</tr>\n";
 	}
 
-	if (
-		permission_exists('voicemail_file') &&
-		permission_exists('voicemail_local_after_email')
-		) {
+	if (permission_exists('voicemail_file') && permission_exists('voicemail_local_after_email')) {
 		echo "<tr>\n";
 		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
 		echo "	".$text['label-voicemail_local_after_email']."\n";

From dde61fdeeb89b87a9d813c4b26ff2b887d263cf2 Mon Sep 17 00:00:00 2001
From: wouam31200 <105128426+wouam31200@users.noreply.github.com>
Date: Sat, 22 Feb 2025 16:36:12 +0100
Subject: [PATCH 41/55] Add template sip server (#7270)

* W80 Sip Server Template

* Update Template Sip Server
---
 .../provision/yealink/w80/y000000000175.cfg   | 295 +++++++++---------
 .../provision/yealink/w80/{$mac}.cfg          |  16 +-
 2 files changed, 163 insertions(+), 148 deletions(-)

diff --git a/resources/templates/provision/yealink/w80/y000000000175.cfg b/resources/templates/provision/yealink/w80/y000000000175.cfg
index 4cec6c0fe4..30334562a4 100644
--- a/resources/templates/provision/yealink/w80/y000000000175.cfg
+++ b/resources/templates/provision/yealink/w80/y000000000175.cfg
@@ -202,12 +202,12 @@ over_the_air.url =
 over_the_air.url.w53h = {$yealink_firmware_url}/{$yealink_w53h_handset_firmware_url}
 over_the_air.url.w56h = {$yealink_firmware_url}/{$yealink_w56h_handset_firmware_url}
 over_the_air.url.cp930w = {$yealink_firmware_url}/{$yealink_cp930w_firmware_url}
-over_the_air.url.cp935w = {$yealink_firmware_url}/{$yealink_cp935w_firmware_url}
+over_the_air.url.cp935w = {$yealink_firmware_url}/{$yealink_cp935w_firmware_url}
 over_the_air.url.t41s_dd10k = {$yealink_firmware_url}/{$yealink_t41s_dd10k_firmware_url}
-over_the_air.url.w59r = {$yealink_firmware_url}/{$yealink_w59r_handset_firmware_url}
-over_the_air.url.w57r = {$yealink_firmware_url}/{$yealink_w57r_handset_firmware_url}
-over_the_air.url.w73h = {$yealink_firmware_url}/{$yealink_w73h_handset_firmware_url}
-over_the_air.url.w78h = {$yealink_firmware_url}/{$yealink_w78h_handset_firmware_url}
+over_the_air.url.w59r = {$yealink_firmware_url}/{$yealink_w59r_handset_firmware_url}
+over_the_air.url.w57r = {$yealink_firmware_url}/{$yealink_w57r_handset_firmware_url}
+over_the_air.url.w73h = {$yealink_firmware_url}/{$yealink_w73h_handset_firmware_url}
+over_the_air.url.w78h = {$yealink_firmware_url}/{$yealink_w78h_handset_firmware_url}
 over_the_air.base_trigger = 1
 over_the_air.handset_trigger =
 over_the_air.handset_tip = 1
@@ -573,22 +573,22 @@ phone_setting.ringback_timeout =
 
 #static.security.user_name.user = 
 #static.security.user_name.admin = 
-
-{if isset($user_name) }
-static.security.user_name.user = {$user_name}
-static.security.user_password = {$user_name}:{$user_password}
-{/if}
-
-{if isset($admin_name) }
-static.security.user_name.admin = {$admin_name}
-static.security.user_password = {$admin_name}:{$admin_password}
-{/if}
-
-{if isset($var_name) }
-static.security.user_name.var = {$var_name}
-static.security.user_password = {$var_name}:{$var_password}
-{/if}
-
+
+{if isset($user_name) }
+static.security.user_name.user = {$user_name}
+static.security.user_password = {$user_name}:{$user_password}
+{/if}
+
+{if isset($admin_name) }
+static.security.user_name.admin = {$admin_name}
+static.security.user_password = {$admin_name}:{$admin_password}
+{/if}
+
+{if isset($var_name) }
+static.security.user_name.var = {$var_name}
+static.security.user_password = {$var_name}:{$var_password}
+{/if}
+
 
 base.pin_code =
 base.double_pin_code.enable = 
@@ -638,8 +638,8 @@ static.phone_setting.reserve_certs_enable =
 
 wui_lang.delete = 
 wui_lang.url = 
-lang.gui= {$yealink_language_gui}
-lang.wui= {$yealink_language_web}
+lang.gui= {$yealink_language_gui}
+lang.wui= {$yealink_language_web}
 
 #######################################################################################
 ##                                   Customized Factory Configurations               ##
@@ -659,12 +659,12 @@ static.custom_mac_cfg.url =
 #######################################################################################
 
 static.auto_provision.handset_configured.enable = 
-static.auto_provision.custom.handset.protect =
-
-#custom.handset.language: 0-English, 1-French, 2-German, 3-Italian, 4-Polish, 5-Portuguese, 6-Spanish, 7-Turkish, 8- Russian, 9-Czech (only for CP935W), 10-Swedish, 11-Slovak (only for CP935W)
-custom.handset.language= {$yealink_custom_handset_language}
+static.auto_provision.custom.handset.protect =
 
-custom.handset.time_format =
+#custom.handset.language: 0-English, 1-French, 2-German, 3-Italian, 4-Polish, 5-Portuguese, 6-Spanish, 7-Turkish, 8- Russian, 9-Czech (only for CP935W), 10-Swedish, 11-Slovak (only for CP935W)
+custom.handset.language= {$yealink_custom_handset_language}
+
+custom.handset.time_format =
 custom.handset.date_format =   
 custom.handset.screen_saver.enable =
 custom.handset.backlight_in_charger.enable = 
@@ -696,107 +696,107 @@ custom.handset.wallpaper =
 #######################################################################################
 #X ranges from 1 to 100
 #handset.X.reg.enable =
-#handset.X.ipui =
-handset.1.ipui = {$yealink_handset_1_ipui}
-handset.2.ipui = {$yealink_handset_2_ipui}
-handset.3.ipui = {$yealink_handset_3_ipui}
-handset.4.ipui = {$yealink_handset_4_ipui}
-handset.5.ipui = {$yealink_handset_5_ipui}
-handset.6.ipui = {$yealink_handset_6_ipui}
-handset.7.ipui = {$yealink_handset_7_ipui}
-handset.8.ipui = {$yealink_handset_8_ipui}
-handset.9.ipui = {$yealink_handset_9_ipui}
-handset.10.ipui = {$yealink_handset_10_ipui}
-handset.11.ipui = {$yealink_handset_11_ipui}
-handset.12.ipui = {$yealink_handset_12_ipui}
-handset.13.ipui = {$yealink_handset_13_ipui}
-handset.14.ipui = {$yealink_handset_14_ipui}
-handset.15.ipui = {$yealink_handset_15_ipui}
-handset.16.ipui = {$yealink_handset_16_ipui}
-handset.17.ipui = {$yealink_handset_17_ipui}
-handset.18.ipui = {$yealink_handset_18_ipui}
-handset.19.ipui = {$yealink_handset_19_ipui}
-handset.20.ipui = {$yealink_handset_20_ipui}
-handset.21.ipui = {$yealink_handset_21_ipui}
-handset.22.ipui = {$yealink_handset_22_ipui}
-handset.23.ipui = {$yealink_handset_23_ipui}
-handset.24.ipui = {$yealink_handset_24_ipui}
-handset.25.ipui = {$yealink_handset_25_ipui}
-handset.26.ipui = {$yealink_handset_26_ipui}
-handset.27.ipui = {$yealink_handset_27_ipui}
-handset.28.ipui = {$yealink_handset_28_ipui}
-handset.29.ipui = {$yealink_handset_29_ipui}
-handset.30.ipui = {$yealink_handset_30_ipui}
-handset.31.ipui = {$yealink_handset_31_ipui}
-handset.32.ipui = {$yealink_handset_32_ipui}
-handset.33.ipui = {$yealink_handset_33_ipui}
-handset.34.ipui = {$yealink_handset_34_ipui}
-handset.35.ipui = {$yealink_handset_35_ipui}
-handset.36.ipui = {$yealink_handset_36_ipui}
-handset.37.ipui = {$yealink_handset_37_ipui}
-handset.38.ipui = {$yealink_handset_38_ipui}
-handset.39.ipui = {$yealink_handset_39_ipui}
-handset.40.ipui = {$yealink_handset_40_ipui}
-handset.41.ipui = {$yealink_handset_41_ipui}
-handset.42.ipui = {$yealink_handset_42_ipui}
-handset.43.ipui = {$yealink_handset_43_ipui}
-handset.44.ipui = {$yealink_handset_44_ipui}
-handset.45.ipui = {$yealink_handset_45_ipui}
-handset.46.ipui = {$yealink_handset_46_ipui}
-handset.47.ipui = {$yealink_handset_47_ipui}
-handset.48.ipui = {$yealink_handset_48_ipui}
-handset.49.ipui = {$yealink_handset_49_ipui}
-handset.50.ipui = {$yealink_handset_50_ipui}
-handset.51.ipui = {$yealink_handset_51_ipui}
-handset.52.ipui = {$yealink_handset_52_ipui}
-handset.53.ipui = {$yealink_handset_53_ipui}
-handset.54.ipui = {$yealink_handset_54_ipui}
-handset.55.ipui = {$yealink_handset_55_ipui}
-handset.56.ipui = {$yealink_handset_56_ipui}
-handset.57.ipui = {$yealink_handset_57_ipui}
-handset.58.ipui = {$yealink_handset_58_ipui}
-handset.59.ipui = {$yealink_handset_59_ipui}
-handset.60.ipui = {$yealink_handset_60_ipui}
-handset.61.ipui = {$yealink_handset_61_ipui}
-handset.62.ipui = {$yealink_handset_62_ipui}
-handset.63.ipui = {$yealink_handset_63_ipui}
-handset.64.ipui = {$yealink_handset_64_ipui}
-handset.65.ipui = {$yealink_handset_65_ipui}
-handset.66.ipui = {$yealink_handset_66_ipui}
-handset.67.ipui = {$yealink_handset_67_ipui}
-handset.68.ipui = {$yealink_handset_68_ipui}
-handset.69.ipui = {$yealink_handset_69_ipui}
-handset.70.ipui = {$yealink_handset_70_ipui}
-handset.71.ipui = {$yealink_handset_71_ipui}
-handset.72.ipui = {$yealink_handset_72_ipui}
-handset.73.ipui = {$yealink_handset_73_ipui}
-handset.74.ipui = {$yealink_handset_74_ipui}
-handset.75.ipui = {$yealink_handset_75_ipui}
-handset.76.ipui = {$yealink_handset_76_ipui}
-handset.77.ipui = {$yealink_handset_77_ipui}
-handset.78.ipui = {$yealink_handset_78_ipui}
-handset.79.ipui = {$yealink_handset_79_ipui}
-handset.80.ipui = {$yealink_handset_80_ipui}
-handset.81.ipui = {$yealink_handset_81_ipui}
-handset.82.ipui = {$yealink_handset_82_ipui}
-handset.83.ipui = {$yealink_handset_83_ipui}
-handset.84.ipui = {$yealink_handset_84_ipui}
-handset.85.ipui = {$yealink_handset_85_ipui}
-handset.86.ipui = {$yealink_handset_86_ipui}
-handset.87.ipui = {$yealink_handset_87_ipui}
-handset.88.ipui = {$yealink_handset_88_ipui}
-handset.89.ipui = {$yealink_handset_89_ipui}
-handset.90.ipui = {$yealink_handset_90_ipui}
-handset.91.ipui = {$yealink_handset_91_ipui}
-handset.92.ipui = {$yealink_handset_92_ipui}
-handset.93.ipui = {$yealink_handset_93_ipui}
-handset.94.ipui = {$yealink_handset_94_ipui}
-handset.95.ipui = {$yealink_handset_95_ipui}
-handset.96.ipui = {$yealink_handset_96_ipui}
-handset.97.ipui = {$yealink_handset_97_ipui}
-handset.98.ipui = {$yealink_handset_98_ipui}
-handset.99.ipui = {$yealink_handset_99_ipui}
-handset.100.ipui = {$yealink_handset_100_ipui}
+#handset.X.ipui =
+handset.1.ipui = {$yealink_handset_1_ipui}
+handset.2.ipui = {$yealink_handset_2_ipui}
+handset.3.ipui = {$yealink_handset_3_ipui}
+handset.4.ipui = {$yealink_handset_4_ipui}
+handset.5.ipui = {$yealink_handset_5_ipui}
+handset.6.ipui = {$yealink_handset_6_ipui}
+handset.7.ipui = {$yealink_handset_7_ipui}
+handset.8.ipui = {$yealink_handset_8_ipui}
+handset.9.ipui = {$yealink_handset_9_ipui}
+handset.10.ipui = {$yealink_handset_10_ipui}
+handset.11.ipui = {$yealink_handset_11_ipui}
+handset.12.ipui = {$yealink_handset_12_ipui}
+handset.13.ipui = {$yealink_handset_13_ipui}
+handset.14.ipui = {$yealink_handset_14_ipui}
+handset.15.ipui = {$yealink_handset_15_ipui}
+handset.16.ipui = {$yealink_handset_16_ipui}
+handset.17.ipui = {$yealink_handset_17_ipui}
+handset.18.ipui = {$yealink_handset_18_ipui}
+handset.19.ipui = {$yealink_handset_19_ipui}
+handset.20.ipui = {$yealink_handset_20_ipui}
+handset.21.ipui = {$yealink_handset_21_ipui}
+handset.22.ipui = {$yealink_handset_22_ipui}
+handset.23.ipui = {$yealink_handset_23_ipui}
+handset.24.ipui = {$yealink_handset_24_ipui}
+handset.25.ipui = {$yealink_handset_25_ipui}
+handset.26.ipui = {$yealink_handset_26_ipui}
+handset.27.ipui = {$yealink_handset_27_ipui}
+handset.28.ipui = {$yealink_handset_28_ipui}
+handset.29.ipui = {$yealink_handset_29_ipui}
+handset.30.ipui = {$yealink_handset_30_ipui}
+handset.31.ipui = {$yealink_handset_31_ipui}
+handset.32.ipui = {$yealink_handset_32_ipui}
+handset.33.ipui = {$yealink_handset_33_ipui}
+handset.34.ipui = {$yealink_handset_34_ipui}
+handset.35.ipui = {$yealink_handset_35_ipui}
+handset.36.ipui = {$yealink_handset_36_ipui}
+handset.37.ipui = {$yealink_handset_37_ipui}
+handset.38.ipui = {$yealink_handset_38_ipui}
+handset.39.ipui = {$yealink_handset_39_ipui}
+handset.40.ipui = {$yealink_handset_40_ipui}
+handset.41.ipui = {$yealink_handset_41_ipui}
+handset.42.ipui = {$yealink_handset_42_ipui}
+handset.43.ipui = {$yealink_handset_43_ipui}
+handset.44.ipui = {$yealink_handset_44_ipui}
+handset.45.ipui = {$yealink_handset_45_ipui}
+handset.46.ipui = {$yealink_handset_46_ipui}
+handset.47.ipui = {$yealink_handset_47_ipui}
+handset.48.ipui = {$yealink_handset_48_ipui}
+handset.49.ipui = {$yealink_handset_49_ipui}
+handset.50.ipui = {$yealink_handset_50_ipui}
+handset.51.ipui = {$yealink_handset_51_ipui}
+handset.52.ipui = {$yealink_handset_52_ipui}
+handset.53.ipui = {$yealink_handset_53_ipui}
+handset.54.ipui = {$yealink_handset_54_ipui}
+handset.55.ipui = {$yealink_handset_55_ipui}
+handset.56.ipui = {$yealink_handset_56_ipui}
+handset.57.ipui = {$yealink_handset_57_ipui}
+handset.58.ipui = {$yealink_handset_58_ipui}
+handset.59.ipui = {$yealink_handset_59_ipui}
+handset.60.ipui = {$yealink_handset_60_ipui}
+handset.61.ipui = {$yealink_handset_61_ipui}
+handset.62.ipui = {$yealink_handset_62_ipui}
+handset.63.ipui = {$yealink_handset_63_ipui}
+handset.64.ipui = {$yealink_handset_64_ipui}
+handset.65.ipui = {$yealink_handset_65_ipui}
+handset.66.ipui = {$yealink_handset_66_ipui}
+handset.67.ipui = {$yealink_handset_67_ipui}
+handset.68.ipui = {$yealink_handset_68_ipui}
+handset.69.ipui = {$yealink_handset_69_ipui}
+handset.70.ipui = {$yealink_handset_70_ipui}
+handset.71.ipui = {$yealink_handset_71_ipui}
+handset.72.ipui = {$yealink_handset_72_ipui}
+handset.73.ipui = {$yealink_handset_73_ipui}
+handset.74.ipui = {$yealink_handset_74_ipui}
+handset.75.ipui = {$yealink_handset_75_ipui}
+handset.76.ipui = {$yealink_handset_76_ipui}
+handset.77.ipui = {$yealink_handset_77_ipui}
+handset.78.ipui = {$yealink_handset_78_ipui}
+handset.79.ipui = {$yealink_handset_79_ipui}
+handset.80.ipui = {$yealink_handset_80_ipui}
+handset.81.ipui = {$yealink_handset_81_ipui}
+handset.82.ipui = {$yealink_handset_82_ipui}
+handset.83.ipui = {$yealink_handset_83_ipui}
+handset.84.ipui = {$yealink_handset_84_ipui}
+handset.85.ipui = {$yealink_handset_85_ipui}
+handset.86.ipui = {$yealink_handset_86_ipui}
+handset.87.ipui = {$yealink_handset_87_ipui}
+handset.88.ipui = {$yealink_handset_88_ipui}
+handset.89.ipui = {$yealink_handset_89_ipui}
+handset.90.ipui = {$yealink_handset_90_ipui}
+handset.91.ipui = {$yealink_handset_91_ipui}
+handset.92.ipui = {$yealink_handset_92_ipui}
+handset.93.ipui = {$yealink_handset_93_ipui}
+handset.94.ipui = {$yealink_handset_94_ipui}
+handset.95.ipui = {$yealink_handset_95_ipui}
+handset.96.ipui = {$yealink_handset_96_ipui}
+handset.97.ipui = {$yealink_handset_97_ipui}
+handset.98.ipui = {$yealink_handset_98_ipui}
+handset.99.ipui = {$yealink_handset_99_ipui}
+handset.100.ipui = {$yealink_handset_100_ipui}
 
 
 
@@ -907,16 +907,31 @@ static.station.*.network.gateway=
 static.station.*.network.mask=
 
 #* range from 1 to 10
-template.*.name=
-template.*.outbound.*.address=
-template.*.outbound.*.port=
-template.*.outbound.enable=
-template.*.outbound.fallback_interval=
-template.*.sip_server.*.address=
-template.*.sip_server.*.expires=
-template.*.sip_server.*.port=
-template.*.sip_server.*.retry_counts=
-template.*.sip_server.*.transport_type=
+#template.*.name=
+#template.*.outbound.*.address=
+#template.*.outbound.*.port=
+#template.*.outbound.enable=
+#template.*.outbound.fallback_interval=
+#template.*.sip_server.*.address=
+#template.*.sip_server.*.expires=
+#template.*.sip_server.*.port=
+#template.*.sip_server.*.retry_counts=
+#template.*.sip_server.*.transport_type=
+
+template.1.name= FusionPBX
+template.1.outbound.1.address= {$row.outbound_proxy_primary}
+template.1.outbound.1.port= {$outbound_proxy_1_port}
+template.1.outbound.enable= {if isset($row.outbound_proxy_primary)}1{else}0{/if}
+template.1.outbound.fallback_interval= {$outbound_proxy_fallback_interval}
+template.1.sip_server.1.address= {$row.server_address}
+template.1.sip_server.1.expires= {$row.register_expires}
+template.1.sip_server.1.port= {$row.sip_port}
+template.1.sip_server.1.retry_counts= 3
+
+{if $account.{$row.line_number}.sip_transport == 'udp'}template.1.sip_server.1.transport_type= = 0{/if}
+{if $account.{$row.line_number}.sip_transport == 'tcp'}template.1.sip_server.1.transport_type= 1{/if}
+{if $account.{$row.line_number}.sip_transport == 'tls'}template.1.sip_server.1.transport_type= 2{/if}
+{if $account.{$row.line_number}.sip_transport == 'dns srv'}template.1.sip_server.1.transport_type= 3{/if}
 
 #W80B ADD
-features.media_transmit.enable= 
\ No newline at end of file
+features.media_transmit.enable= 
diff --git a/resources/templates/provision/yealink/w80/{$mac}.cfg b/resources/templates/provision/yealink/w80/{$mac}.cfg
index df8be86a45..a655db3a34 100644
--- a/resources/templates/provision/yealink/w80/{$mac}.cfg
+++ b/resources/templates/provision/yealink/w80/{$mac}.cfg
@@ -2,9 +2,9 @@
 
 ##File header "#!version:1.0.0.1" can not be edited or deleted.##
 
-#Account.X Settings ,X Range from 1 to 100
+#Account.X Settings ,X Range from 1 to 100
 
-{foreach $lines as $row}
+{foreach $lines as $row}
 
 #######################################################################################
 ##                                   Account1 Settings                               ##                                       
@@ -27,7 +27,7 @@ account.{$row.line_number}.auth_name = {$row.auth_id}
 account.{$row.line_number}.password = {$row.password}
 
 #W80B ADD
-account.{$row.line_number}.sip_server.template = 
+account.{$row.line_number}.sip_server.template = 1
 account.{$row.line_number}.media_transmit.enable = 
 
 #######################################################################################
@@ -77,7 +77,7 @@ account.{$row.line_number}.anonymous_reject_offcode =
 #######################################################################################
 ##                                   Codec                                           ##
 #######################################################################################
-account.{$row.line_number}.codec.g722.enable = {if isset($yealink_codec_g722_enable)}{$yealink_codec_g722_enable}{else}0{/if}
+account.{$row.line_number}.codec.g722.enable = {if isset($yealink_codec_g722_enable)}{$yealink_codec_g722_enable}{else}0{/if}
 
 account.{$row.line_number}.codec.g722.priority = {if isset($yealink_codec_g722_priority)}{$yealink_codec_g722_priority}{else}0{/if}
 
@@ -102,9 +102,9 @@ account.{$row.line_number}.codec.ilbc.priority = {if isset($yealink_codec_iLBC_p
 account.{$row.line_number}.codec.pcmu.enable = {if isset($yealink_codec_pcmu_enable) && $yealink_codec_pcmu_enable}1{else}{0}{/if}
 account.{$row.line_number}.codec.pcmu.priority = {if isset($yealink_codec_pcmu_priority)}{$yealink_codec_pcmu_priority}{else}0{/if}
 
-account.{$row.line_number}.codec.pcma.enable = {if isset($yealink_codec_pcma_enable) && $yealink_codec_pcma_enable}1{else}{0}{/if}
+account.{$row.line_number}.codec.pcma.enable = {if isset($yealink_codec_pcma_enable) && $yealink_codec_pcma_enable}1{else}{0}{/if}
 
-account.{$row.line_number}.codec.pcma.priority = {if isset($yealink_codec_pcma_priority)}{$yealink_codec_pcma_priority}{else}0{/if}
+account.{$row.line_number}.codec.pcma.priority = {if isset($yealink_codec_pcma_priority)}{$yealink_codec_pcma_priority}{else}0{/if}
 
 
 account.{$row.line_number}.codec.opus.enable = {if isset($yealink_codec_opus_enable) && $yealink_codec_opus_enable}1{else}0{/if}
@@ -167,7 +167,7 @@ account.{$row.line_number}.cid_source_privacy =
 account.{$row.line_number}.cid_source_ppi = 
 
 #Enable or disable the session timer; 0-Disabled (default), 1-Enabled;  
-account.{$row.line_number}.session_timer.enable = {$yealink_session_timer}
+account.{$row.line_number}.session_timer.enable = {$yealink_session_timer}
 
 #Configure the refresh session timer interval (in seconds). It ranges from 1 to 9999.
 account.{$row.line_number}.session_timer.expires =           
@@ -294,4 +294,4 @@ account.{$row.line_number}.xsi.server_type =
 
 ##It configures the server port of the Xtended Services Platform server.
 ##The default value is 80.Integer from 1 to 65535
-account.{$row.line_number}.xsi.port = 
\ No newline at end of file
+account.{$row.line_number}.xsi.port = 

From bb0386e95274948d4cf9ff358b830f954d5deb4d Mon Sep 17 00:00:00 2001
From: n0obHere <156116672+n0obHere@users.noreply.github.com>
Date: Sat, 22 Feb 2025 22:39:08 -0500
Subject: [PATCH 42/55] Align search input text field with buttons (#7251)

---
 themes/default/css.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/themes/default/css.php b/themes/default/css.php
index c3f0b40cb4..b2d13c6882 100644
--- a/themes/default/css.php
+++ b/themes/default/css.php
@@ -2188,6 +2188,7 @@ else { //default: white
 		-webkit-transition: all 0.25s ease;
 		-moz-transition: all 0.25s ease;
 		transition: all 0.25s ease;
+		vertical-align: middle;
 		}
 
 	input[type=text].list-search:focus {

From 6f26f3d386a47021e3ae48c9200bbe91de0642b0 Mon Sep 17 00:00:00 2001
From: FusionPBX <mark@fusionpbx.com>
Date: Mon, 24 Feb 2025 10:05:03 -0700
Subject: [PATCH 43/55] Fix item overflow affected

This problem didn't affect all screen resolutions.
---
 core/contacts/contact_edit.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/contacts/contact_edit.php b/core/contacts/contact_edit.php
index 75e7caf809..e95f3c1393 100644
--- a/core/contacts/contact_edit.php
+++ b/core/contacts/contact_edit.php
@@ -1574,7 +1574,7 @@ if ($_SESSION['contact']['permissions']['boolean'] == "true") {
 			}
 			if (permission_exists('contact_user_add')) {
 				echo "		<div class='vtable' style='border-bottom: none;'>\n";
-				echo "			<select name='contact_user_uuid' class='formfld' style='width: auto;'>\n";
+				echo "			<select name='contact_user_uuid' class='formfld' style='width: 112px;'>\n";
 				echo "				<option value=''></option>\n";
 				foreach ($users as $field) {
 					if (!empty($contact_users_assigned) && in_array($field['user_uuid'], array_column($contact_users_assigned, 'user_uuid'))) { continue; } //skip users already assigned
@@ -1632,7 +1632,7 @@ if ($_SESSION['contact']['permissions']['boolean'] == "true") {
 			if (permission_exists('contact_group_add')) {
 				if (!empty($contact_groups_available)) {
 					echo "	<div class='vtable' style='border-bottom: none;'>\n";
-					echo "		<select name='contact_group_uuid' class='formfld' style='width: auto; margin-right: 3px;'>\n";
+					echo "		<select name='contact_group_uuid' class='formfld' style='width: 112px;'>\n";
 					echo "			<option value=''></option>\n";
 					foreach ($contact_groups_available as $field) {
 						if ($field['group_name'] == "superadmin" && !if_group("superadmin")) { continue; }	//only show superadmin group to superadmins
@@ -1788,10 +1788,10 @@ if (permission_exists('contact_phone_view')) {
 		echo "		<div class='label'>\n";
 		echo "			".$text['label-phone_type']."\n";
 		echo "		</div>\n";
-		echo "		<div class='field no-wrap'>\n";
-		echo "			<label style='padding-top: 2px; margin: 0;'><input type='checkbox' name='contact_phones[$x][phone_type_voice]' id='phone_type_voice' value='1' ".(($row['phone_type_voice']) ? "checked='checked'" : null)."> ".$text['label-voice']."</label>&nbsp;\n";
-		echo "			<label style='padding-top: 2px; margin: 0;'><input type='checkbox' name='contact_phones[$x][phone_type_fax]' id='phone_type_fax' value='1' ".(($row['phone_type_fax']) ? "checked='checked'" : null)."> ".$text['label-fax']."</label>&nbsp;\n";
-		echo "			<label style='padding-top: 2px; margin: 0;'><input type='checkbox' name='contact_phones[$x][phone_type_video]' id='phone_type_video' value='1' ".(($row['phone_type_video']) ? "checked='checked'" : null)."> ".$text['label-video']."</label>&nbsp;\n";
+		echo "		<div class='field no-wrap' style='display: flex; flex-wrap: wrap; gap: 3px;'>\n";
+		echo "			<label style='padding-top: 2px; margin: 0;'><input type='checkbox' name='contact_phones[$x][phone_type_voice]' id='phone_type_voice' value='1' ".(($row['phone_type_voice']) ? "checked='checked'" : null)."> ".$text['label-voice']."</label>\n";
+		echo "			<label style='padding-top: 2px; margin: 0;'><input type='checkbox' name='contact_phones[$x][phone_type_fax]' id='phone_type_fax' value='1' ".(($row['phone_type_fax']) ? "checked='checked'" : null)."> ".$text['label-fax']."</label>\n";
+		echo "			<label style='padding-top: 2px; margin: 0;'><input type='checkbox' name='contact_phones[$x][phone_type_video]' id='phone_type_video' value='1' ".(($row['phone_type_video']) ? "checked='checked'" : null)."> ".$text['label-video']."</label>\n";
 		echo "			<label style='padding-top: 2px; margin: 0;'><input type='checkbox' name='contact_phones[$x][phone_type_text]' id='phone_type_text' value='1' ".(($row['phone_type_text']) ? "checked='checked'" : null)."> ".$text['label-text']."</label>\n";
 		echo "			<br />\n";
 		//echo 			$text['description-phone_type']."\n";

From bbe7b76673a4958c7c8dafb89e01c707088a536f Mon Sep 17 00:00:00 2001
From: FusionPBX <markjcrane@gmail.com>
Date: Mon, 24 Feb 2025 22:07:34 -0700
Subject: [PATCH 44/55] Add more FIFO Queue features - Ring Strategy - Queue -
 Exit Key - Exit Action

---
 app/fifo/app_config.php    |  24 ++-
 app/fifo/app_languages.php | 293 ++++++++++++++++++++++++++++++++++++-
 app/fifo/fifo.php          |   9 +-
 app/fifo/fifo_edit.php     | 208 +++++++++++++++++++++-----
 4 files changed, 489 insertions(+), 45 deletions(-)

diff --git a/app/fifo/app_config.php b/app/fifo/app_config.php
index f0871a7c7e..8dca1f66ec 100644
--- a/app/fifo/app_config.php
+++ b/app/fifo/app_config.php
@@ -5,7 +5,7 @@
 		$apps[$x]['uuid'] = '16589224-c876-aeb3-f59f-523a1c0801f7';
 		$apps[$x]['category'] = 'Switch';
 		$apps[$x]['subcategory'] = '';
-		$apps[$x]['version'] = '2.0';
+		$apps[$x]['version'] = '2.1';
 		$apps[$x]['license'] = 'Mozilla Public License 1.1';
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
 		$apps[$x]['description']['en-us'] = "Queues are used to setup waiting lines for callers. Also known as FIFO Queues.";
@@ -140,11 +140,31 @@
 		$apps[$x]['db'][$y]['fields'][$z]['search_by'] = '';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'A feature code for the agent to login or logout of the Queue.';
 		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "fifo_strategy";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['search'] = 'true';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Select the strategy.";
+		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'fifo_members';
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
 		$apps[$x]['db'][$y]['fields'][$z]['search_by'] = '';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
 		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'fifo_timeout_seconds';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['search_by'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'fifo_exit_key';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'numeric';
+		$apps[$x]['db'][$y]['fields'][$z]['search_by'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'fifo_exit_action';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['search_by'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'fifo_music';
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
 		$apps[$x]['db'][$y]['fields'][$z]['search_by'] = '';
@@ -268,4 +288,4 @@
 	//cache details
 		$apps[$x]['cache']['key'] = "dialplan.\${domain_name}";
 
-?>
+?>
\ No newline at end of file
diff --git a/app/fifo/app_languages.php b/app/fifo/app_languages.php
index 4f2a5c1ec2..cba78e315d 100644
--- a/app/fifo/app_languages.php
+++ b/app/fifo/app_languages.php
@@ -324,6 +324,87 @@ $text['description-fifo_agent_queue']['zh-cn'] = "代理等待呼叫者或接听
 $text['description-fifo_agent_queue']['ja-jp'] = "エージェントが発信者を待機したり、キューで待機中の通話に応答したりするためのキュー。";
 $text['description-fifo_agent_queue']['ko-kr'] = "상담원이 발신자를 기다리거나 대기열에 대기 중인 전화를 받기 위한 대기열입니다.";
 
+$text['label-strategy']['en-us'] = "Strategy";
+$text['label-strategy']['en-gb'] = "Strategy";
+$text['label-strategy']['ar-eg'] = "الاستراتيجية";
+$text['label-strategy']['de-at'] = "Strategie";
+$text['label-strategy']['de-ch'] = "Strategie";
+$text['label-strategy']['de-de'] = "Strategie";
+$text['label-strategy']['el-gr'] = "Στρατηγική";
+$text['label-strategy']['es-cl'] = "Estrategia";
+$text['label-strategy']['es-mx'] = "Estrategia";
+$text['label-strategy']['fr-ca'] = "Stratégie";
+$text['label-strategy']['fr-fr'] = "Stratégie";
+$text['label-strategy']['he-il'] = "אסטרטגיה";
+$text['label-strategy']['it-it'] = "Strategia";
+$text['label-strategy']['ka-ge'] = "სტრატეგია";
+$text['label-strategy']['nl-nl'] = "Strategie";
+$text['label-strategy']['pl-pl'] = "Strategia";
+$text['label-strategy']['pt-br'] = "Estratégia";
+$text['label-strategy']['pt-pt'] = "Estratégia";
+$text['label-strategy']['ro-ro'] = "Strategie";
+$text['label-strategy']['ru-ru'] = "Стратегия";
+$text['label-strategy']['sv-se'] = "Strategi";
+$text['label-strategy']['uk-ua'] = "Стратегія";
+$text['label-strategy']['tr-tr'] = "Strateji";
+$text['label-strategy']['zh-cn'] = "战略";
+$text['label-strategy']['ja-jp'] = "ストラテジー";
+$text['label-strategy']['ko-kr'] = "전략";
+
+$text['description-strategy']['en-us'] = "Select the ring strategy.";
+$text['description-strategy']['en-gb'] = "Select the ring strategy.";
+$text['description-strategy']['ar-eg'] = "اختيار استراتيجية الخاتم.";
+$text['description-strategy']['de-at'] = "Wählen Sie eine Strategie.";
+$text['description-strategy']['de-ch'] = "Wählen Sie eine Strategie.";
+$text['description-strategy']['de-de'] = "Wählen Sie eine Strategie.";
+$text['description-strategy']['el-gr'] = "Επιλέξτε τη στρατηγική του δακτυλίου.";
+$text['description-strategy']['es-cl'] = "Ingrese la estrategia de llamado.";
+$text['description-strategy']['es-mx'] = "Ingrese la estrategia de llamado.";
+$text['description-strategy']['fr-ca'] = "Choisir la statégie de sonnerie.";
+$text['description-strategy']['fr-fr'] = "Choisir la statégie de sonnerie.";
+$text['description-strategy']['he-il'] = "בחר את אסטרטגיית החיוג";
+$text['description-strategy']['it-it'] = "Selezionare la strategia di squillo.";
+$text['description-strategy']['ka-ge'] = "აირჩიეთ ზარის სტრატეგია.";
+$text['description-strategy']['nl-nl'] = "Kies de bel strategie.";
+$text['description-strategy']['pl-pl'] = "Wybierz strategię";
+$text['description-strategy']['pt-br'] = "Selecione a estraétia da fila";
+$text['description-strategy']['pt-pt'] = "Escolha o tipo de estratégia de toque.";
+$text['description-strategy']['ro-ro'] = "Selectați strategia de inel.";
+$text['description-strategy']['ru-ru'] = "Выберите стратегию вызовов.";
+$text['description-strategy']['sv-se'] = "Välj strategi för ringflöde.";
+$text['description-strategy']['uk-ua'] = "Виберіть стратегію кільця.";
+$text['description-strategy']['tr-tr'] = "Zil stratejisini seçin.";
+$text['description-strategy']['zh-cn'] = "选择响铃策略。";
+$text['description-strategy']['ja-jp'] = "リング戦略を選択します。";
+$text['description-strategy']['ko-kr'] = "링 전략을 선택합니다.";
+
+$text['message-strategy']['en-us'] = "Please provide: Strategy";
+$text['message-strategy']['en-gb'] = "Please provide: Strategy";
+$text['message-strategy']['ar-eg'] = "يرجى تقديم ما يلي: الاستراتيجية";
+$text['message-strategy']['de-at'] = "Bitte geben Sie folgendes an: Strategie";
+$text['message-strategy']['de-ch'] = "Bitte geben Sie folgendes an: Strategie";
+$text['message-strategy']['de-de'] = "Bitte geben Sie folgendes an: Strategie";
+$text['message-strategy']['el-gr'] = "Παρέχετε: Στρατηγική";
+$text['message-strategy']['es-cl'] = "Por favor indique: Estrategia";
+$text['message-strategy']['es-mx'] = "Por favor indique: Estrategia";
+$text['message-strategy']['fr-ca'] = "Merci d'indiquer: Stratégie";
+$text['message-strategy']['fr-fr'] = "Merci d'indiquer: Stratégie";
+$text['message-strategy']['he-il'] = "נא לספק: אסטרטגיה";
+$text['message-strategy']['it-it'] = "Prego fornire: Strategia";
+$text['message-strategy']['ka-ge'] = "შეიყვანეთ: სტრატეგია";
+$text['message-strategy']['nl-nl'] = "Geef aub.: Strategie";
+$text['message-strategy']['pl-pl'] = "Wprowadź strategię";
+$text['message-strategy']['pt-br'] = "Por favor indique: Estratégia";
+$text['message-strategy']['pt-pt'] = "Por favor indique: Estratégia";
+$text['message-strategy']['ro-ro'] = "Vă rugăm să furnizați: Strategie";
+$text['message-strategy']['ru-ru'] = "Пожалуйста укажите: Стратегию";
+$text['message-strategy']['sv-se'] = "Ange: Strategi";
+$text['message-strategy']['uk-ua'] = "Будь ласка, заповніть: Стратегія";
+$text['message-strategy']['tr-tr'] = "Lütfen sağlayın: Strateji";
+$text['message-strategy']['zh-cn'] = "请提供：策略";
+$text['message-strategy']['ja-jp'] = "提供してください: 戦略";
+$text['message-strategy']['ko-kr'] = "제공하십시오: 전략";
+
 $text['label-fifo_members']['en-us'] = "Agents";
 $text['label-fifo_members']['en-gb'] = "Agents";
 $text['label-fifo_members']['ar-eg'] = "عملاء";
@@ -377,6 +458,7 @@ $text['description-fifo_members']['zh-cn'] = "代理是队列的成员。队列
 $text['description-fifo_members']['ja-jp'] = "エージェントはキューのメンバーです。キュー内の通話は、対応可能なエージェントに分配されます。";
 $text['description-fifo_members']['ko-kr'] = "에이전트는 대기열의 멤버입니다. 대기열의 통화는 사용 가능한 에이전트에게 분배됩니다.";
 
+
 $text['label-fifo_music']['en-us'] = "Music";
 $text['label-fifo_music']['en-gb'] = "Music";
 $text['label-fifo_music']['ar-eg'] = "موسيقى";
@@ -431,6 +513,162 @@ $text['description-fifo_music']['zh-cn'] = "选择排队等候时可以听到的
 $text['description-fifo_music']['ja-jp'] = "キューで待機中に聞く保留音を選択します。";
 $text['description-fifo_music']['ko-kr'] = "대기열에서 기다리는 동안 들을 수 있는 대기 음악을 선택하세요.";
 
+$text['label-fifo_timeout_seconds']['en-us'] = 'Timeout';
+$text['label-fifo_timeout_seconds']['en-gb'] = 'Timeout';
+$text['label-fifo_timeout_seconds']['ar-eg'] = '';
+$text['label-fifo_timeout_seconds']['de-at'] = '';
+$text['label-fifo_timeout_seconds']['de-ch'] = '';
+$text['label-fifo_timeout_seconds']['de-de'] = '';
+$text['label-fifo_timeout_seconds']['el-gr'] = '';
+$text['label-fifo_timeout_seconds']['es-cl'] = '';
+$text['label-fifo_timeout_seconds']['es-mx'] = '';
+$text['label-fifo_timeout_seconds']['fr-ca'] = '';
+$text['label-fifo_timeout_seconds']['fr-fr'] = '';
+$text['label-fifo_timeout_seconds']['he-il'] = '';
+$text['label-fifo_timeout_seconds']['it-it'] = '';
+$text['label-fifo_timeout_seconds']['nl-nl'] = '';
+$text['label-fifo_timeout_seconds']['pl-pl'] = '';
+$text['label-fifo_timeout_seconds']['pt-br'] = '';
+$text['label-fifo_timeout_seconds']['pt-pt'] = '';
+$text['label-fifo_timeout_seconds']['ro-ro'] = '';
+$text['label-fifo_timeout_seconds']['ru-ru'] = '';
+$text['label-fifo_timeout_seconds']['sv-se'] = '';
+$text['label-fifo_timeout_seconds']['uk-ua'] = '';
+$text['label-fifo_timeout_seconds']['tr-tr'] = '';
+$text['label-fifo_timeout_seconds']['zh-cn'] = '';
+$text['label-fifo_timeout_seconds']['ja-jp'] = '';
+$text['label-fifo_timeout_seconds']['ko-kr'] = '';
+
+$text['description-fifo_timeout_seconds']['en-us'] = 'Enter the queue timeout seconds. 0 means no queue timeout.';
+$text['description-fifo_timeout_seconds']['en-gb'] = 'Enter the queue timeout seconds. 0 means no queue timeout.';
+$text['description-fifo_timeout_seconds']['ar-eg'] = '';
+$text['description-fifo_timeout_seconds']['de-at'] = '';
+$text['description-fifo_timeout_seconds']['de-ch'] = '';
+$text['description-fifo_timeout_seconds']['de-de'] = '';
+$text['description-fifo_timeout_seconds']['el-gr'] = '';
+$text['description-fifo_timeout_seconds']['es-cl'] = '';
+$text['description-fifo_timeout_seconds']['es-mx'] = '';
+$text['description-fifo_timeout_seconds']['fr-ca'] = '';
+$text['description-fifo_timeout_seconds']['fr-fr'] = '';
+$text['description-fifo_timeout_seconds']['he-il'] = '';
+$text['description-fifo_timeout_seconds']['it-it'] = '';
+$text['description-fifo_timeout_seconds']['nl-nl'] = '';
+$text['description-fifo_timeout_seconds']['pl-pl'] = '';
+$text['description-fifo_timeout_seconds']['pt-br'] = '';
+$text['description-fifo_timeout_seconds']['pt-pt'] = '';
+$text['description-fifo_timeout_seconds']['ro-ro'] = '';
+$text['description-fifo_timeout_seconds']['ru-ru'] = '';
+$text['description-fifo_timeout_seconds']['sv-se'] = '';
+$text['description-fifo_timeout_seconds']['uk-ua'] = '';
+$text['description-fifo_timeout_seconds']['tr-tr'] = '';
+$text['description-fifo_timeout_seconds']['zh-cn'] = '';
+$text['description-fifo_timeout_seconds']['ja-jp'] = '';
+$text['description-fifo_timeout_seconds']['ko-kr'] = '';
+
+$text['label-fifo_exit_key']['en-us'] = 'Exit Key';
+$text['label-fifo_exit_key']['en-gb'] = 'Exit Key';
+$text['label-fifo_exit_key']['ar-eg'] = '';
+$text['label-fifo_exit_key']['de-at'] = '';
+$text['label-fifo_exit_key']['de-ch'] = '';
+$text['label-fifo_exit_key']['de-de'] = '';
+$text['label-fifo_exit_key']['el-gr'] = '';
+$text['label-fifo_exit_key']['es-cl'] = '';
+$text['label-fifo_exit_key']['es-mx'] = '';
+$text['label-fifo_exit_key']['fr-ca'] = '';
+$text['label-fifo_exit_key']['fr-fr'] = '';
+$text['label-fifo_exit_key']['he-il'] = '';
+$text['label-fifo_exit_key']['it-it'] = '';
+$text['label-fifo_exit_key']['nl-nl'] = '';
+$text['label-fifo_exit_key']['pl-pl'] = '';
+$text['label-fifo_exit_key']['pt-br'] = '';
+$text['label-fifo_exit_key']['pt-pt'] = '';
+$text['label-fifo_exit_key']['ro-ro'] = '';
+$text['label-fifo_exit_key']['ru-ru'] = '';
+$text['label-fifo_exit_key']['sv-se'] = '';
+$text['label-fifo_exit_key']['uk-ua'] = '';
+$text['label-fifo_exit_key']['tr-tr'] = '';
+$text['label-fifo_exit_key']['zh-cn'] = '';
+$text['label-fifo_exit_key']['ja-jp'] = '';
+$text['label-fifo_exit_key']['ko-kr'] = '';
+
+$text['description-fifo_exit_key']['en-us'] = 'Enter the number to exit the queue.';
+$text['description-fifo_exit_key']['en-gb'] = 'Enter the number to exit the queue.';
+$text['description-fifo_exit_key']['ar-eg'] = '';
+$text['description-fifo_exit_key']['de-at'] = '';
+$text['description-fifo_exit_key']['de-ch'] = '';
+$text['description-fifo_exit_key']['de-de'] = '';
+$text['description-fifo_exit_key']['el-gr'] = '';
+$text['description-fifo_exit_key']['es-cl'] = '';
+$text['description-fifo_exit_key']['es-mx'] = '';
+$text['description-fifo_exit_key']['fr-ca'] = '';
+$text['description-fifo_exit_key']['fr-fr'] = '';
+$text['description-fifo_exit_key']['he-il'] = '';
+$text['description-fifo_exit_key']['it-it'] = '';
+$text['description-fifo_exit_key']['nl-nl'] = '';
+$text['description-fifo_exit_key']['pl-pl'] = '';
+$text['description-fifo_exit_key']['pt-br'] = '';
+$text['description-fifo_exit_key']['pt-pt'] = '';
+$text['description-fifo_exit_key']['ro-ro'] = '';
+$text['description-fifo_exit_key']['ru-ru'] = '';
+$text['description-fifo_exit_key']['sv-se'] = '';
+$text['description-fifo_exit_key']['uk-ua'] = '';
+$text['description-fifo_exit_key']['tr-tr'] = '';
+$text['description-fifo_exit_key']['zh-cn'] = '';
+$text['description-fifo_exit_key']['ja-jp'] = '';
+$text['description-fifo_exit_key']['ko-kr'] = '';
+
+$text['label-fifo_exit_action']['en-us'] = 'Exit Action';
+$text['label-fifo_exit_action']['en-gb'] = 'Exit Action';
+$text['label-fifo_exit_action']['ar-eg'] = '';
+$text['label-fifo_exit_action']['de-at'] = '';
+$text['label-fifo_exit_action']['de-ch'] = '';
+$text['label-fifo_exit_action']['de-de'] = '';
+$text['label-fifo_exit_action']['el-gr'] = '';
+$text['label-fifo_exit_action']['es-cl'] = '';
+$text['label-fifo_exit_action']['es-mx'] = '';
+$text['label-fifo_exit_action']['fr-ca'] = '';
+$text['label-fifo_exit_action']['fr-fr'] = '';
+$text['label-fifo_exit_action']['he-il'] = '';
+$text['label-fifo_exit_action']['it-it'] = '';
+$text['label-fifo_exit_action']['nl-nl'] = '';
+$text['label-fifo_exit_action']['pl-pl'] = '';
+$text['label-fifo_exit_action']['pt-br'] = '';
+$text['label-fifo_exit_action']['pt-pt'] = '';
+$text['label-fifo_exit_action']['ro-ro'] = '';
+$text['label-fifo_exit_action']['ru-ru'] = '';
+$text['label-fifo_exit_action']['sv-se'] = '';
+$text['label-fifo_exit_action']['uk-ua'] = '';
+$text['label-fifo_exit_action']['tr-tr'] = '';
+$text['label-fifo_exit_action']['zh-cn'] = '';
+$text['label-fifo_exit_action']['ja-jp'] = '';
+$text['label-fifo_exit_action']['ko-kr'] = '';
+
+$text['description-fifo_exit_action']['en-us'] = 'Select where to route the caller when exiting the queue.';
+$text['description-fifo_exit_action']['en-gb'] = 'Select where to route the caller when exiting the queue.';
+$text['description-fifo_exit_action']['ar-eg'] = '';
+$text['description-fifo_exit_action']['de-at'] = '';
+$text['description-fifo_exit_action']['de-ch'] = '';
+$text['description-fifo_exit_action']['de-de'] = '';
+$text['description-fifo_exit_action']['el-gr'] = '';
+$text['description-fifo_exit_action']['es-cl'] = '';
+$text['description-fifo_exit_action']['es-mx'] = '';
+$text['description-fifo_exit_action']['fr-ca'] = '';
+$text['description-fifo_exit_action']['fr-fr'] = '';
+$text['description-fifo_exit_action']['he-il'] = '';
+$text['description-fifo_exit_action']['it-it'] = '';
+$text['description-fifo_exit_action']['nl-nl'] = '';
+$text['description-fifo_exit_action']['pl-pl'] = '';
+$text['description-fifo_exit_action']['pt-br'] = '';
+$text['description-fifo_exit_action']['pt-pt'] = '';
+$text['description-fifo_exit_action']['ro-ro'] = '';
+$text['description-fifo_exit_action']['ru-ru'] = '';
+$text['description-fifo_exit_action']['sv-se'] = '';
+$text['description-fifo_exit_action']['uk-ua'] = '';
+$text['description-fifo_exit_action']['tr-tr'] = '';
+$text['description-fifo_exit_action']['zh-cn'] = '';
+$text['description-fifo_exit_action']['ja-jp'] = '';
+$text['description-fifo_exit_action']['ko-kr'] = '';
+
 $text['label-fifo_order']['en-us'] = "Order";
 $text['label-fifo_order']['en-gb'] = "Order";
 $text['label-fifo_order']['ar-eg'] = "طلب";
@@ -755,6 +993,59 @@ $text['description-member_simultaneous']['zh-cn'] = "同时输入成员。";
 $text['description-member_simultaneous']['ja-jp'] = "メンバー同時入力。";
 $text['description-member_simultaneous']['ko-kr'] = "회원을 동시 입력하세요.";
 
+$text['option-longest_idle_agent']['en-us'] = "Longest Idle Agent";
+$text['option-longest_idle_agent']['en-gb'] = "Longest Idle Agent";
+$text['option-longest_idle_agent']['ar-eg'] = "أطول عامل خامل";
+$text['option-longest_idle_agent']['de-at'] = "Agent mit der höchsten Wartezeit";
+$text['option-longest_idle_agent']['de-ch'] = "Agent mit der höchsten Wartezeit";
+$text['option-longest_idle_agent']['de-de'] = "Agent mit der höchsten Wartezeit";
+$text['option-longest_idle_agent']['el-gr'] = "Ο μακρύτερος πράκτορας σε αδράνεια";
+$text['option-longest_idle_agent']['es-cl'] = "Agente desocupado por más tiempo";
+$text['option-longest_idle_agent']['es-mx'] = "Agente desocupado por más tiempo";
+$text['option-longest_idle_agent']['fr-ca'] = "Agent inactif le plus longtemps";
+$text['option-longest_idle_agent']['fr-fr'] = "Agent inactif le plus longtemps";
+$text['option-longest_idle_agent']['he-il'] = "סוכן הסרק הארוך ביותר";
+$text['option-longest_idle_agent']['it-it'] = "Da più tempo libero";
+$text['option-longest_idle_agent']['ka-ge'] = "ოპერატორი, რომელიც ყველაზე დიდხანს იყო უქმად";
+$text['option-longest_idle_agent']['nl-nl'] = "Langst wachtende agent";
+$text['option-longest_idle_agent']['pl-pl'] = "Najdlużej bezczynny agent";
+$text['option-longest_idle_agent']['pt-br'] = "Agente desocupado há mais tempo";
+$text['option-longest_idle_agent']['pt-pt'] = "Agente desocupado há mais tempo";
+$text['option-longest_idle_agent']['ro-ro'] = "Cel mai lung agent inactiv";
+$text['option-longest_idle_agent']['ru-ru'] = "Максимально незанятый оператор";
+$text['option-longest_idle_agent']['sv-se'] = "Agent Längst Ledig";
+$text['option-longest_idle_agent']['uk-ua'] = "Найдовше бездіяльний агент";
+$text['option-longest_idle_agent']['zh-cn'] = "最长空闲代理";
+$text['option-longest_idle_agent']['ja-jp'] = "最長アイドル エージェント";
+$text['option-longest_idle_agent']['ko-kr'] = "가장 긴 유휴 에이전트";
+
+$text['option-simultaneous']['en-us'] = "Simultaneous";
+$text['option-simultaneous']['en-gb'] = "Simultaneous";
+$text['option-simultaneous']['ar-eg'] = "بسيطة";
+$text['option-simultaneous']['de-at'] = "gleichzeitig";
+$text['option-simultaneous']['de-ch'] = "gleichzeitig";
+$text['option-simultaneous']['de-de'] = "gleichzeitig";
+$text['option-simultaneous']['el-gr'] = "Ταυτόχρονος";
+$text['option-simultaneous']['es-cl'] = "Simultaneos";
+$text['option-simultaneous']['es-mx'] = "Simultaneos";
+$text['option-simultaneous']['fr-ca'] = "Simultané";
+$text['option-simultaneous']['fr-fr'] = "Simultané";
+$text['option-simultaneous']['he-il'] = "באותו הזמן";
+$text['option-simultaneous']['it-it'] = "Parallelo";
+$text['option-simultaneous']['ka-ge'] = "ერთდროული";
+$text['option-simultaneous']['nl-nl'] = "Gelijktijdig";
+$text['option-simultaneous']['pl-pl'] = "Jednoczesne";
+$text['option-simultaneous']['pt-br'] = "Simultâneo";
+$text['option-simultaneous']['pt-pt'] = "Simultâneo";
+$text['option-simultaneous']['ro-ro'] = "Simultan";
+$text['option-simultaneous']['ru-ru'] = "Одновременное";
+$text['option-simultaneous']['sv-se'] = "Samtidig";
+$text['option-simultaneous']['uk-ua'] = "Симулятор";
+$text['option-simultaneous']['tr-tr'] = "Eş zamanlı";
+$text['option-simultaneous']['zh-cn'] = "同时";
+$text['option-simultaneous']['ja-jp'] = "同時に";
+$text['option-simultaneous']['ko-kr'] = "동시";
+
 $text['label-member_wrap_up_time']['en-us'] = "Wrap Up Time";
 $text['label-member_wrap_up_time']['en-gb'] = "Wrap Up Time";
 $text['label-member_wrap_up_time']['ar-eg'] = "وقت الختام";
@@ -836,4 +1127,4 @@ $text['label-member_enabled']['zh-cn'] = "已启用";
 $text['label-member_enabled']['ja-jp'] = "有効";
 $text['label-member_enabled']['ko-kr'] = "활성화됨";
 
-?>
+?>
\ No newline at end of file
diff --git a/app/fifo/fifo.php b/app/fifo/fifo.php
index 54e50a05a0..53f2ed7dc3 100644
--- a/app/fifo/fifo.php
+++ b/app/fifo/fifo.php
@@ -145,8 +145,8 @@
 	$sql .= "fifo_uuid, ";
 	$sql .= "fifo_name, ";
 	$sql .= "fifo_extension, ";
-	$sql .= "fifo_agent_queue, ";
 	$sql .= "fifo_agent_status, ";
+	$sql .= "fifo_agent_queue, ";
 	$sql .= "fifo_music, ";
 	$sql .= "u.domain_uuid, ";
 	$sql .= "d.domain_name, ";
@@ -249,8 +249,8 @@
 	}
 	echo th_order_by('fifo_name', $text['label-fifo_name'], $order_by, $order);
 	echo th_order_by('fifo_extension', $text['label-fifo_extension'], $order_by, $order);
-	echo th_order_by('fifo_agent_queue', $text['label-fifo_agent_queue'], $order_by, $order);
 	echo th_order_by('fifo_agent_status', $text['label-fifo_agent_status'], $order_by, $order);
+	echo th_order_by('fifo_agent_queue', $text['label-fifo_agent_queue'], $order_by, $order);
 	echo th_order_by('fifo_order', $text['label-fifo_order'], $order_by, $order);
 	echo th_order_by('fifo_enabled', $text['label-enabled'], $order_by, $order, null, "class='center'");
 	echo "	<th class='hide-sm-dn'>".$text['label-fifo_description']."</th>\n";
@@ -287,8 +287,8 @@
 			}
 			echo "	</td>\n";
 			echo "	<td>".escape($row['fifo_extension'])."</td>\n";
-			echo "	<td>".escape($row['fifo_agent_queue'])."</td>\n";
 			echo "	<td>".escape($row['fifo_agent_status'])."</td>\n";
+			echo "	<td>".escape($row['fifo_agent_queue'])."</td>\n";
 			echo "	<td>".escape($row['fifo_order'])."</td>\n";
 			if (permission_exists('fifo_edit')) {
 				echo "	<td class='no-link center'>\n";
@@ -322,5 +322,4 @@
 //include the footer
 	require_once "resources/footer.php";
 
-?>
-
+?>
\ No newline at end of file
diff --git a/app/fifo/fifo_edit.php b/app/fifo/fifo_edit.php
index ef1d4cf2a1..cb2937581f 100644
--- a/app/fifo/fifo_edit.php
+++ b/app/fifo/fifo_edit.php
@@ -39,9 +39,15 @@
 	$language = new text;
 	$text = $language->get();
 
+//connect to the database
+	$database = database::new();
+
 //add the settings object
 	$settings = new settings(["domain_uuid" => $_SESSION['domain_uuid'], "user_uuid" => $_SESSION['user_uuid']]);
 
+//setup the event socket connection
+	$event_socket = event_socket::create();
+
 //set from session variables
 	$button_icon_back = $settings->get('theme', 'button_icon_back', '');
 	$button_icon_copy = $settings->get('theme', 'button_icon_copy', '');
@@ -66,7 +72,11 @@
 		$fifo_extension = $_POST["fifo_extension"];
 		$fifo_agent_status = $_POST["fifo_agent_status"];
 		$fifo_agent_queue = $_POST["fifo_agent_queue"];
+		$fifo_strategy = $_POST["fifo_strategy"];
 		$fifo_members = $_POST["fifo_members"];
+		$fifo_timeout_seconds = $_POST["fifo_timeout_seconds"];
+		$fifo_exit_key = $_POST["fifo_exit_key"];
+		$fifo_exit_action = $_POST["fifo_exit_action"];
 		$fifo_music = $_POST["fifo_music"];
 		$domain_uuid = $_POST["domain_uuid"];
 		$fifo_order = $_POST["fifo_order"];
@@ -104,20 +114,17 @@
 				switch ($_POST['action']) {
 					case 'copy':
 						if (permission_exists('fifo_add')) {
-							$obj = new database;
-							$obj->copy($array);
+							$database->copy($array);
 						}
 						break;
 					case 'delete':
 						if (permission_exists('fifo_delete')) {
-							$obj = new database;
-							$obj->delete($array);
+							$database->delete($array);
 						}
 						break;
 					case 'toggle':
 						if (permission_exists('fifo_update')) {
-							$obj = new database;
-							$obj->toggle($array);
+							$database->toggle($array);
 						}
 						break;
 				}
@@ -135,7 +142,11 @@
 			if (strlen($fifo_extension) == 0) { $msg .= $text['message-required']." ".$text['label-fifo_extension']."<br>\n"; }
 			//if (strlen($fifo_agent_status) == 0) { $msg .= $text['message-required']." ".$text['label-fifo_agent_status']."<br>\n"; }
 			//if (strlen($fifo_agent_queue) == 0) { $msg .= $text['message-required']." ".$text['label-fifo_agent_queue']."<br>\n"; }
+			if (strlen($fifo_strategy) == 0) { $msg .= $text['message-required']." ".$text['label-fifo_strategy']."<br>\n"; }
 			//if (strlen($fifo_members) == 0) { $msg .= $text['message-required']." ".$text['label-fifo_members']."<br>\n"; }
+			//if (strlen($fifo_timeout_seconds) == 0) { $msg .= $text['message-required']." ".$text['label-fifo_timeout_seconds']."<br>\n"; }
+			//if (strlen($fifo_exit_key) == 0) { $msg .= $text['message-required']." ".$text['label-fifo_exit_key']."<br>\n"; }
+			//if (strlen($fifo_exit_action) == 0) { $msg .= $text['message-required']." ".$text['label-fifo_exit_action']."<br>\n"; }
 			//if (strlen($fifo_music) == 0) { $msg .= $text['message-required']." ".$text['label-fifo_music']."<br>\n"; }
 			if (strlen($domain_uuid) == 0) { $msg .= $text['message-required']." ".$text['label-domain_uuid']."<br>\n"; }
 			if (strlen($fifo_order) == 0) { $msg .= $text['message-required']." ".$text['label-fifo_order']."<br>\n"; }
@@ -177,6 +188,11 @@
 			$array['fifo'][0]['fifo_extension'] = $fifo_extension;
 			$array['fifo'][0]['fifo_agent_status'] = $fifo_agent_status;
 			$array['fifo'][0]['fifo_agent_queue'] = $fifo_agent_queue;
+			$array['fifo'][0]['fifo_strategy'] = $fifo_strategy;
+			$array['fifo'][0]['fifo_timeout_seconds'] = $fifo_timeout_seconds;
+			$array['fifo'][0]['fifo_exit_key'] = $fifo_exit_key;
+			$array['fifo'][0]['fifo_exit_action'] = $fifo_exit_action;
+			$array['fifo'][0]['fifo_exit_key'] = $fifo_exit_key;
 			$array['fifo'][0]['fifo_music'] = $fifo_music;
 			$array['fifo'][0]['fifo_order'] = $fifo_order;
 			$array['fifo'][0]['fifo_enabled'] = $fifo_enabled;
@@ -197,32 +213,85 @@
 				}
 			}
 
+		//send commands for agent login or agent logout
+			if (is_array($fifo_members)) {
+				foreach ($fifo_members as $row) {
+					//build the command to add or remove the agent from the FIFO queue
+					if ($row["member_enabled"] == 'true') {
+						$command = "fifo_member add ".$fifo_extension."@".$_SESSION['domain_name']." {fifo_member_wait=nowait}".$row["member_contact"]." 5 ".$row['member_call_timeout']." ".$row['member_wrap_up_time'];
+					}
+					else {
+						$command = "fifo_member del ".$fifo_extension."@".$_SESSION['domain_name']." {fifo_member_wait=nowait}".$row["member_contact"];
+					}
+					if ($event_socket->is_connected()) {
+						$response = event_socket::api($command);
+					}
+				}
+			}
+
+		//get the action destination number
+			if (!empty($fifo_exit_action)) {
+				$fifo_exit_destination = explode(':', $fifo_exit_action)[1];
+				$fifo_exit_destination = explode(' ', $fifo_exit_destination)[0];
+			}
+
 		//add the fifo dialplan
 			if (!empty($fifo_extension)) {
 				//escape the * symbol
 				$fifo_agent_status_xml = str_replace("*", "\*", $fifo_agent_status);
 				$fifo_agent_queue_xml = str_replace("*", "\*", $fifo_agent_queue);
 
+				//prepare the fifo orbit extension
+				if (!empty($fifo_exit_destination) && $fifo_timeout_seconds == 0) {
+					$fifo_orbit_exten = $fifo_exit_destination;
+				}
+				else {
+					$fifo_orbit_exten = $fifo_exit_destination.":".$fifo_timeout_seconds;
+				}
+
 				//build the xml dialplan
 				$dialplan_xml = "<extension name=\"".xml::sanitize($fifo_name)."\" continue=\"false\" uuid=\"".xml::sanitize($dialplan_uuid)."\">\n";
 				$dialplan_xml .= "	<condition field=\"destination_number\" expression=\"^".xml::sanitize($fifo_extension)."\$\" break=\"on-true\">\n";
-				$dialplan_xml .= "		<action application=\"set\" data=\"fifo_uuid=".$fifo_uuid."\" inline=\"true\"/>\n";
-				$dialplan_xml .= "		<action application=\"set\" data=\"fifo_music=".$fifo_music."\" inline=\"true\"/>\n";
+				$dialplan_xml .= "		<action application=\"set\" data=\"fifo_uuid=".xml::sanitize($fifo_uuid)."\" inline=\"true\"/>\n";
+				$dialplan_xml .= "		<action application=\"set\" data=\"fifo_music=".xml::sanitize($fifo_music)."\" inline=\"true\"/>\n";
+				if ($fifo_strategy == 'longest_idle_agent') {
+					$dialplan_xml .= "		<action application=\"set\" data=\"fifo_strategy=waiting_longer\" inline=\"true\"/>\n";
+				}
+				if ($fifo_strategy == 'simultaneous') {
+					$dialplan_xml .= "		<action application=\"set\" data=\"fifo_strategy=more_ppl\" inline=\"true\"/>\n";
+				}
+			/*
+			<action application="set" data="fifo_orbit_dialplan=XML"/>
+			<action application="set" data="fifo_orbit_context=default"/>
+			<action application="set" data="fifo_orbit_announce=digits/6.wav"/>
+			<action application="set" data="fifo_caller_exit_key=2"/>
+			<action application="set" data="fifo_caller_exit_to_orbit=true"/>
+			*/
+				if (!empty($fifo_exit_key)) {
+					$dialplan_xml .= "		<action application=\"set\" data=\"fifo_caller_exit_key=".xml::sanitize($fifo_exit_key)."\"/>\n";
+					$dialplan_xml .= "		<action application=\"set\" data=\"fifo_orbit_dialplan=XML\"/>\n";
+					$dialplan_xml .= "		<action application=\"set\" data=\"fifo_orbit_context=".xml::sanitize($_SESSION['domain_name'])."\"/>\n";
+					$dialplan_xml .= "		<action application=\"set\" data=\"fifo_caller_exit_to_orbit=true\"/>\n";
+
+				}
+				if (!empty($fifo_orbit_exten)) {
+					$dialplan_xml .= "		<action application=\"set\" data=\"fifo_orbit_exten=".xml::sanitize($fifo_orbit_exten)."\"/>\n";
+				}
 				$dialplan_xml .= "		<action application=\"answer\" data=\"\"/>\n";
-				$dialplan_xml .= "		<action application=\"fifo\" data=\"$queue_name in\"/>\n";
+				$dialplan_xml .= "		<action application=\"fifo\" data=\"".xml::sanitize($queue_name)." in\"/>\n";
 				$dialplan_xml .= "	</condition>\n";
-				$dialplan_xml .= "	<condition field=\"destination_number\" expression=\"^".$fifo_agent_status_xml."\$\" break=\"on-true\">\n";
-				$dialplan_xml .= "		<action application=\"set\" data=\"fifo_uuid=".$fifo_uuid."\" inline=\"true\"/>\n";
-				$dialplan_xml .= "		<action application=\"set\" data=\"fifo_name=$queue_name\" inline=\"true\"/>\n";
+				$dialplan_xml .= "	<condition field=\"destination_number\" expression=\"^".xml::sanitize($fifo_agent_status_xml)."\$\" break=\"on-true\">\n";
+				$dialplan_xml .= "		<action application=\"set\" data=\"fifo_uuid=".xml::sanitize($fifo_uuid)."\" inline=\"true\"/>\n";
+				$dialplan_xml .= "		<action application=\"set\" data=\"fifo_name=".xml::sanitize($queue_name)."\" inline=\"true\"/>\n";
 				$dialplan_xml .= "		<action application=\"set\" data=\"user_name=\${caller_id_number}@\${domain_name}\" inline=\"true\"/>\n";
 				$dialplan_xml .= "		<action application=\"set\" data=\"pin_number=\" inline=\"true\"/>\n";
 				$dialplan_xml .= "		<action application=\"lua\" data=\"app/fifo/resources/scripts/member.lua\"/>\n";
 				$dialplan_xml .= "	</condition>\n";
-				$dialplan_xml .= "	<condition field=\"destination_number\" expression=\"^".$fifo_agent_queue_xml."\$\" break=\"on-true\">\n";
-				$dialplan_xml .= "		<action application=\"set\" data=\"fifo_uuid=".$fifo_uuid."\" inline=\"true\"/>\n";
-				$dialplan_xml .= "		<action application=\"set\" data=\"fifo_music=".$fifo_music."\" inline=\"true\"/>\n";
+				$dialplan_xml .= "	<condition field=\"destination_number\" expression=\"^".xml::sanitize($fifo_agent_queue_xml)."\$\" break=\"on-true\">\n";
+				$dialplan_xml .= "		<action application=\"set\" data=\"fifo_uuid=".xml::sanitize($fifo_uuid)."\" inline=\"true\"/>\n";
+				$dialplan_xml .= "		<action application=\"set\" data=\"fifo_music=".xml::sanitize($fifo_music)."\" inline=\"true\"/>\n";
 				$dialplan_xml .= "		<action application=\"answer\" data=\"\"/>\n";
-				$dialplan_xml .= "		<action application=\"fifo\" data=\"$queue_name out wait\"/>\n";
+				$dialplan_xml .= "		<action application=\"fifo\" data=\"".xml::sanitize($queue_name)." out wait\"/>\n";
 				$dialplan_xml .= "	</condition>\n";
 				$dialplan_xml .= "</extension>\n";
 
@@ -247,7 +316,6 @@
 			$p->add("dialplan_edit", "temp");
 
 		//save the data
-			$database = new database;
 			$database->app_name = 'fifo';
 			$database->app_uuid = '16589224-c876-aeb3-f59f-523a1c0801f7';
 			$result = $database->save($array);
@@ -296,6 +364,10 @@
 		$sql .= " fifo_extension, ";
 		$sql .= " fifo_agent_status, ";
 		$sql .= " fifo_agent_queue, ";
+		$sql .= " fifo_strategy, ";
+		$sql .= " fifo_timeout_seconds, ";
+		$sql .= " fifo_exit_key, ";
+		$sql .= " fifo_exit_action, ";
 		$sql .= " fifo_music, ";
 		$sql .= " domain_uuid, ";
 		$sql .= " fifo_order, ";
@@ -306,7 +378,6 @@
 		//$sql .= "and domain_uuid = :domain_uuid ";
 		//$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 		$parameters['fifo_uuid'] = $fifo_uuid;
-		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');
 		if (is_array($row) && @sizeof($row) != 0) {
 			$dialplan_uuid = $row["dialplan_uuid"];
@@ -314,6 +385,10 @@
 			$fifo_extension = $row["fifo_extension"];
 			$fifo_agent_status = $row["fifo_agent_status"];
 			$fifo_agent_queue = $row["fifo_agent_queue"];
+			$fifo_strategy = $row["fifo_strategy"];
+			$fifo_timeout_seconds = $row["fifo_timeout_seconds"];
+			$fifo_exit_key = $row["fifo_exit_key"];
+			$fifo_exit_action = $row["fifo_exit_action"];
 			$fifo_music = $row["fifo_music"];
 			$domain_uuid = $row["domain_uuid"];
 			$fifo_order = $row["fifo_order"];
@@ -339,7 +414,6 @@
 		//$sql .= "and domain_uuid = '".$domain_uuid."' ";
 		//$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 		$parameters['fifo_uuid'] = $fifo_uuid;
-		$database = new database;
 		$fifo_members = $database->select($sql, $parameters, 'all');
 		unset ($sql, $parameters);
 	}
@@ -358,16 +432,28 @@
 		$fifo_member_uuid = uuid();
 	}
 
-//add an empty row
-	$x = isset($fifo_members) && is_array($fifo_members) ? sizeof($fifo_members) : 0;
-	$fifo_members[$x]['domain_uuid'] = $_SESSION['domain_uuid'];
-	$fifo_members[$x]['fifo_uuid'] = $fifo_uuid;
-	$fifo_members[$x]['fifo_member_uuid'] = uuid();
-	$fifo_members[$x]['member_contact'] = '';
-	$fifo_members[$x]['member_call_timeout'] = '';
-	//$fifo_members[$x]['member_simultaneous'] = '';
-	$fifo_members[$x]['member_wrap_up_time'] = '';
-	$fifo_members[$x]['member_enabled'] = '';
+//add an empty row to the members array
+	if (count($fifo_members) == 0) {
+		$rows = $settings->get('fifo', 'option_add_rows', '5');
+		$id = 0;
+		$show_option_delete = false;
+	}
+	if (count($fifo_members) > 0) {
+		$rows = $settings->get('fifo', 'option_edit_rows', '1');
+		$id = count($fifo_members)+1;
+		$show_option_delete = true;
+	}
+	for ($x = 0; $x < $rows; $x++) {
+		$fifo_members[$id]['domain_uuid'] = $_SESSION['domain_uuid'];
+		$fifo_members[$id]['fifo_uuid'] = $fifo_uuid;
+		$fifo_members[$id]['fifo_member_uuid'] = uuid();
+		$fifo_members[$id]['member_contact'] = '';
+		$fifo_members[$id]['member_call_timeout'] = '';
+		//$fifo_members[$id]['member_simultaneous'] = '';
+		$fifo_members[$id]['member_wrap_up_time'] = '';
+		$fifo_members[$id]['member_enabled'] = '';
+		$id++;
+	}
 
 //create token
 	$object = new token;
@@ -377,11 +463,14 @@
 	$destination = new destinations;
 
 //set the defaults
+	if (empty($fifo_timeout_seconds)) {
+		$fifo_timeout_seconds = 0;
+	}
 	if (empty($fifo_order)) {
 		$fifo_order = 50;
 	}
-	if (!isset($fifo_enabled)) {
-	//	$fifo_enabled = true;
+	if (empty($fifo_enabled)) {
+		$fifo_enabled = true;
 	}
 
 //show the header
@@ -465,6 +554,20 @@
 	echo "</td>\n";
 	echo "</tr>\n";
 
+	echo "<tr>\n";
+	echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	".$text['label-strategy']."\n";
+	echo "</td>\n";
+	echo "<td class='vtable' align='left'>\n";
+	echo "	<select class='formfld' name='fifo_strategy' onchange=\"getElementById('destination_delayorder').innerHTML = (this.selectedIndex == 1 || this.selectedIndex == 3) ? '".$text['label-destination_order']."' : '".$text['label-destination_delay']."';\">\n";
+	echo "		<option value='longest_idle_agent' ".(($fifo_strategy == "'option-longest_idle_agent") ? "selected='selected'" : null).">".$text['option-longest_idle_agent']."</option>\n";
+	echo "		<option value='simultaneous' ".(($fifo_strategy == "simultaneous") ? "selected='selected'" : null).">".$text['option-simultaneous']."</option>\n";
+	echo "	</select>\n";
+	echo "<br />\n";
+	echo $text['description-strategy']."\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
 	echo "<tr>\n";
 	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
 	echo "	".$text['label-fifo_members']."\n";
@@ -477,7 +580,7 @@
 	//echo "			<th class='vtablereq'>".$text['label-member_simultaneous']."</th>\n";
 	echo "			<th class='vtablereq'>".$text['label-member_wrap_up_time']."</th>\n";
 	echo "			<th class='vtablereq'>".$text['label-member_enabled']."</th>\n";
-	if (is_array($fifo_members) && @sizeof($fifo_members) > 1 && permission_exists('fifo_member_delete')) {
+	if ($show_option_delete && is_array($fifo_members) && @sizeof($fifo_members) > 1 && permission_exists('fifo_member_delete')) {
 		echo "			<td class='vtable edit_delete_checkbox_all' onmouseover=\"swap_display('delete_label_details', 'delete_toggle_details');\" onmouseout=\"swap_display('delete_label_details', 'delete_toggle_details');\">\n";
 		echo "				<span id='delete_label_details'>".$text['label-delete']."</span>\n";
 		echo "				<span id='delete_toggle_details'><input type='checkbox' id='checkbox_all_details' name='checkbox_all' onclick=\"edit_all_toggle('details'); checkbox_on_change(this);\"></span>\n";
@@ -523,7 +626,7 @@
 				echo "	</select>\n";
 			}
 			echo "			</td>\n";
-			if (is_array($fifo_members) && @sizeof($fifo_members) > 1 && permission_exists('fifo_member_delete')) {
+			if ($show_option_delete && is_array($fifo_members) && @sizeof($fifo_members) > 1 && permission_exists('fifo_member_delete')) {
 				if (is_uuid($row['fifo_member_uuid'])) {
 					echo "		<td class='vtable' style='text-align: center; padding-bottom: 3px;'>\n";
 					echo "			<input type='checkbox' name='fifo_members[".$x."][checked]' value='true' class='chk_delete checkbox_details' onclick=\"checkbox_on_change(this);\">\n";
@@ -543,16 +646,47 @@
 	echo "</td>\n";
 	echo "</tr>\n";
 
+	echo "<tr>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	".$text['label-fifo_timeout_seconds']."\n";
+	echo "</td>\n";
+	echo "<td class='vtable' style='position: relative;' align='left'>\n";
+	echo "  <input class='formfld' type='text' name='fifo_timeout_seconds' maxlength='255' value='".escape($fifo_timeout_seconds)."'>\n";
+	echo "<br />\n";
+	echo $text['description-fifo_timeout_seconds']."\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
+	echo "<tr>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	".$text['label-fifo_exit_key']."\n";
+	echo "</td>\n";
+	echo "<td class='vtable' style='position: relative;' align='left'>\n";
+	echo "  <input class='formfld' type='text' name='fifo_exit_key' maxlength='255' value='".escape($fifo_exit_key)."'>\n";
+	echo "<br />\n";
+	echo $text['description-fifo_exit_key']."\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
+	echo "<tr>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	".$text['label-fifo_exit_action']."\n";
+	echo "</td>\n";
+	echo "<td class='vtable' style='position: relative;' align='left'>\n";
+	$destination = new destinations;
+	echo $destination->select('dialplan', 'fifo_exit_action', $fifo_exit_action);
+	echo "<br />\n";
+	echo $text['description-fifo_exit_action']."\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
 	echo "<tr>\n";
 	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
 	echo "	".$text['label-fifo_music']."\n";
 	echo "</td>\n";
 	echo "<td class='vtable' style='position: relative;' align='left'>\n";
-	//echo "	<input class='formfld' type='text' name='fifo_music' maxlength='255' value='".escape($fifo_music)."'>\n";
-
 	$ringbacks = new ringbacks;
 	echo $ringbacks->select('fifo_music', $fifo_music ?? null);
-
 	echo "<br />\n";
 	echo $text['description-fifo_music']."\n";
 	echo "</td>\n";
@@ -655,4 +789,4 @@
 //include the footer
 	require_once "resources/footer.php";
 
-?>
+?>
\ No newline at end of file

From ba48d186a9d631e1f3cc57d14d690c5855d7de46 Mon Sep 17 00:00:00 2001
From: Alex <40072887+alexdcrane@users.noreply.github.com>
Date: Tue, 25 Feb 2025 12:35:23 -0700
Subject: [PATCH 45/55] Add content card div to contact email edit and module
 edit (#7272)

* Add content card div to contact email edit and module edit

* Update module_edit.php
---
 app/modules/module_edit.php          | 2 ++
 core/contacts/contact_email_edit.php | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/app/modules/module_edit.php b/app/modules/module_edit.php
index eb482483b9..296432c1f8 100644
--- a/app/modules/module_edit.php
+++ b/app/modules/module_edit.php
@@ -205,6 +205,7 @@
 	echo "	<div style='clear: both;'></div>\n";
 	echo "</div>\n";
 
+	echo "<div class='card'>\n";
 	echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 
 	echo "<tr>\n";
@@ -297,6 +298,7 @@
 	echo "</tr>\n";
 
 	echo "</table>";
+	echo "</div>";
 	echo "<br><br>";
 
 	if ($action == "update") {
diff --git a/core/contacts/contact_email_edit.php b/core/contacts/contact_email_edit.php
index 1f41f0ba77..f8a1229e67 100644
--- a/core/contacts/contact_email_edit.php
+++ b/core/contacts/contact_email_edit.php
@@ -239,6 +239,7 @@ if (!empty($_GET["contact_uuid"]) && is_uuid($_GET["contact_uuid"])) {
 	}
 	echo "<br /><br />\n";
 
+	echo "<div class='card'>\n";
 	echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 
 	echo "<tr>\n";
@@ -311,6 +312,7 @@ if (!empty($_GET["contact_uuid"]) && is_uuid($_GET["contact_uuid"])) {
 	echo "</tr>\n";
 
 	echo "</table>";
+	echo "</div>\n";
 	echo "<br><br>";
 
 	echo "<input type='hidden' name='contact_uuid' value='".escape($contact_uuid ?? '')."'>\n";

From e08a79e64d538fe2a7e292629efda6761dba7b4e Mon Sep 17 00:00:00 2001
From: Alex <40072887+alexdcrane@users.noreply.github.com>
Date: Tue, 25 Feb 2025 12:48:50 -0700
Subject: [PATCH 46/55] Add missing required class to required fields (#7273)

* Add missing required class to required fields

* Update destination_edit.php

* Update device_edit.php

* Update voicemail_edit.php

* Update dashboard_edit.php

* Update call_block_edit.php

* Update destination_edit.php
---
 app/call_block/call_block_edit.php    | 4 ++--
 app/destinations/destination_edit.php | 4 ++--
 app/devices/device_edit.php           | 6 +++---
 app/voicemails/voicemail_edit.php     | 4 ++--
 core/dashboard/dashboard_edit.php     | 6 +++---
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/call_block/call_block_edit.php b/app/call_block/call_block_edit.php
index 669a1f6c57..b4e986a149 100644
--- a/app/call_block/call_block_edit.php
+++ b/app/call_block/call_block_edit.php
@@ -17,7 +17,7 @@
 
 	The Initial Developer of the Original Code is
 	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2008-2024
+	Portions created by the Initial Developer are Copyright (C) 2008-2025
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):
@@ -557,7 +557,7 @@ if (permission_exists('call_block_all') || permission_exists('call_block_ring_gr
 	}
 
 	echo "<tr>\n";
-	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
 	echo "	".$text['label-enabled']."\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
diff --git a/app/destinations/destination_edit.php b/app/destinations/destination_edit.php
index bdcae911f5..bd57431454 100644
--- a/app/destinations/destination_edit.php
+++ b/app/destinations/destination_edit.php
@@ -17,7 +17,7 @@
 
 	The Initial Developer of the Original Code is
 	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2008-2024
+	Portions created by the Initial Developer are Copyright (C) 2008-2025
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):
@@ -2097,7 +2097,7 @@
 
 	//enabled
 	echo "<tr>\n";
-	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
 	echo "	".$text['label-destination_enabled']."\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
diff --git a/app/devices/device_edit.php b/app/devices/device_edit.php
index b8cedfff56..f5567759fe 100644
--- a/app/devices/device_edit.php
+++ b/app/devices/device_edit.php
@@ -17,7 +17,7 @@
 
 	The Initial Developer of the Original Code is
 	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2008-2024
+	Portions created by the Initial Developer are Copyright (C) 2008-2025
 	the Initial Developer. All Rights Reserved.
 
 */
@@ -1101,7 +1101,7 @@
 	echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 
 	echo "<tr>\n";
-	echo "<td class='vncell' width='30%' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "<td class='vncellreq' width='30%' valign='top' align='left' nowrap='nowrap'>\n";
 	echo "	".$text['label-device_address']."\n";
 	echo "</td>\n";
 	echo "<td class='vtable' width='70%' align='left'>\n";
@@ -1992,7 +1992,7 @@
 
 	if (permission_exists('device_enable')) {
 		echo "<tr>\n";
-		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+		echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
 		echo "	".$text['label-device_enabled']."\n";
 		echo "</td>\n";
 		echo "<td class='vtable' align='left'>\n";
diff --git a/app/voicemails/voicemail_edit.php b/app/voicemails/voicemail_edit.php
index 083c525d59..61637bd4c2 100644
--- a/app/voicemails/voicemail_edit.php
+++ b/app/voicemails/voicemail_edit.php
@@ -17,7 +17,7 @@
 
  The Initial Developer of the Original Code is
  Mark J Crane <markjcrane@fusionpbx.com>
- Portions created by the Initial Developer are Copyright (C) 2008-2024
+ Portions created by the Initial Developer are Copyright (C) 2008-2025
  the Initial Developer. All Rights Reserved.
 
  Contributor(s):
@@ -949,7 +949,7 @@
 	}
 
 	echo "<tr>\n";
-	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
 	echo "	".$text['label-voicemail_enabled']."\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
diff --git a/core/dashboard/dashboard_edit.php b/core/dashboard/dashboard_edit.php
index 24915a82c3..3ed5dc78aa 100644
--- a/core/dashboard/dashboard_edit.php
+++ b/core/dashboard/dashboard_edit.php
@@ -18,7 +18,7 @@
 
 	The Initial Developer of the Original Code is
 	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2021-2024
+	Portions created by the Initial Developer are Copyright (C) 2021-2025
 	the Initial Developer. All Rights Reserved.
 */
 
@@ -938,7 +938,7 @@
 		echo "</td>\n";
 		echo "</tr>\n";
 	}
-	
+
 	if ($dashboard_chart_type == "icon") {
 		echo "<tr class='type_icon'>\n";
 		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
@@ -1175,7 +1175,7 @@
 	echo "</tr>\n";
 
 	echo "<tr>\n";
-	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
 	echo "	".$text['label-dashboard_enabled']."\n";
 	echo "</td>\n";
 	echo "<td class='vtable' style='position: relative;' align='left'>\n";

From c22080d2fc3d5a7cb268ce2d01d29bd793ec8936 Mon Sep 17 00:00:00 2001
From: FusionPBX <mark@fusionpbx.com>
Date: Tue, 25 Feb 2025 13:09:49 -0700
Subject: [PATCH 47/55] Fix an unclosed {if} tag

Caused by Commit 40f78c3
---
 resources/templates/provision/grandstream/dp750/{$mac}.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/templates/provision/grandstream/dp750/{$mac}.xml b/resources/templates/provision/grandstream/dp750/{$mac}.xml
index fdf95542fd..d9dcc91f9b 100644
--- a/resources/templates/provision/grandstream/dp750/{$mac}.xml
+++ b/resources/templates/provision/grandstream/dp750/{$mac}.xml
@@ -3095,6 +3095,7 @@
 {elseif $grandstream_automatic_provisioning == 3}
 <P194>2</P194>
 {/if}
+{/if}
 
 <!-- Automatic Provisioning. Check for new config file every () minutes. Default is 7 days. -->
 <!-- Number: 60-86400 -->

From 2f955d4fef155d1f77805ba46cfb9b4771d10d6e Mon Sep 17 00:00:00 2001
From: Alex <40072887+alexdcrane@users.noreply.github.com>
Date: Tue, 25 Feb 2025 13:23:06 -0700
Subject: [PATCH 48/55] Fix queue edit content alignment (#7274)

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

diff --git a/app/fifo/fifo_edit.php b/app/fifo/fifo_edit.php
index cb2937581f..e247ab121b 100644
--- a/app/fifo/fifo_edit.php
+++ b/app/fifo/fifo_edit.php
@@ -511,7 +511,7 @@
 	echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 
 	echo "<tr>\n";
-	echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "<td width='30%' class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
 	echo "	".$text['label-fifo_name']."\n";
 	echo "</td>\n";
 	echo "<td class='vtable' style='position: relative;' align='left'>\n";
@@ -789,4 +789,4 @@
 //include the footer
 	require_once "resources/footer.php";
 
-?>
\ No newline at end of file
+?>

From 305f585b17ec53d7e56dbff43f9be7d6d97c4eb8 Mon Sep 17 00:00:00 2001
From: Alex <40072887+alexdcrane@users.noreply.github.com>
Date: Tue, 25 Feb 2025 16:24:16 -0700
Subject: [PATCH 49/55] Add missing counter divs (#7277)

* Add counter div to voicemail messages and domain settings

* Update domain_settings.php

* Update menu_item_list.php

* Update domain_settings.php

* Update voicemail_messages.php
---
 app/voicemails/voicemail_messages.php    | 4 ++--
 core/domain_settings/domain_settings.php | 4 ++--
 core/menu/menu_item_list.php             | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/voicemails/voicemail_messages.php b/app/voicemails/voicemail_messages.php
index 24290edc9b..39d815fa5b 100644
--- a/app/voicemails/voicemail_messages.php
+++ b/app/voicemails/voicemail_messages.php
@@ -17,7 +17,7 @@
 
  The Initial Developer of the Original Code is
  Mark J Crane <markjcrane@fusionpbx.com>
- Portions created by the Initial Developer are Copyright (C) 2008-2024
+ Portions created by the Initial Developer are Copyright (C) 2008-2025
  the Initial Developer. All Rights Reserved.
 
  Contributor(s):
@@ -322,7 +322,7 @@
 
 //show the content
 	echo "<div class='action_bar' id='action_bar'>\n";
-	echo "	<div class='heading'><b>".$text['title-voicemail_messages']." (".$total_rows.")</b></div>\n";
+	echo "	<div class='heading'><b>".$text['title-voicemail_messages']."</b><div class='count'>".number_format($total_rows)."</div></div>\n";
 	echo "	<div class='actions'>\n";
 	echo button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>$_SESSION['theme']['button_icon_back'],'id'=>'btn_back','link'=>$_SESSION['back'][$_SERVER['PHP_SELF']]]);
 	$margin_left = false;
diff --git a/core/domain_settings/domain_settings.php b/core/domain_settings/domain_settings.php
index 0f3df5c5ec..60d9d01245 100644
--- a/core/domain_settings/domain_settings.php
+++ b/core/domain_settings/domain_settings.php
@@ -17,7 +17,7 @@
 
 	The Initial Developer of the Original Code is
 	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2008 - 2023
+	Portions created by the Initial Developer are Copyright (C) 2008-2025
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):
@@ -161,7 +161,7 @@
 
 //show the content
 	echo "<div class='action_bar' id='action_bar_sub'>\n";
-	echo "	<div class='heading'><b id='heading_sub'>".$domain_name." (".$num_rows.")</b></div>\n"; //$text['title-domain_settings']
+	echo "	<div class='heading'><b id='heading_sub'>".$domain_name."</b><div class='count'>".number_format($num_rows)."</div></div>\n"; //$text['title-domain_settings']
 	echo "	<div class='actions'>\n";
 	echo button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>$_SESSION['theme']['button_icon_back'],'id'=>'action_bar_sub_button_back','style'=>'','link'=>PROJECT_PATH.'/core/domains/domains.php']);
 	if (permission_exists('default_setting_view') && $num_rows) {
diff --git a/core/menu/menu_item_list.php b/core/menu/menu_item_list.php
index 1b3a596e89..282fe7e9bf 100644
--- a/core/menu/menu_item_list.php
+++ b/core/menu/menu_item_list.php
@@ -17,7 +17,7 @@
 
 	The Initial Developer of the Original Code is
 	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2008-2024
+	Portions created by the Initial Developer are Copyright (C) 2008-2025
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):
@@ -240,7 +240,7 @@
 	echo "<input type='hidden' name='menu_uuid' value='".escape($menu_uuid)."'>\n";
 
 	echo "<div class='action_bar' id='action_bar_sub'>\n";
-	echo "	<div class='heading'><b id='heading_sub'>".$text['header-menu_items']." (<span id='num_rows'></span>)</b></div>\n";
+	echo "	<div class='heading'><b id='heading_sub'>".$text['header-menu_items']."</b><div class='count'><span id='num_rows'></span></div></div>\n";
 	echo "	<div class='actions'>\n";
 	echo button::create(['type'=>'button','id'=>'action_bar_sub_button_back','label'=>$text['button-back'],'icon'=>$_SESSION['theme']['button_icon_back'],'collapse'=>'hide-xs','style'=>'margin-right: 15px; display: none;','link'=>'menu.php']);
 	if (permission_exists('menu_item_add')) {

From d919a3cc1b9711063f3341c8dd797d8f734db4af Mon Sep 17 00:00:00 2001
From: frytimo <tim@fusionpbx.com>
Date: Tue, 25 Feb 2025 20:21:41 -0400
Subject: [PATCH 50/55] Add the apcu caching ability for performance (#7276)

* add the apcu caching ability for performance
When the PHP extension APCu is loaded, the settings class and the auto_loader will cache their results across requests in RAM. For more information about the APCu extension visit the PHP page: https://www.php.net/apcu

* use global instead of default terminology
---
 app/sip_status/sip_status.php                 |   1 -
 .../default_settings_reload.php               |   2 +-
 core/domain_settings/domain_setting_edit.php  |   3 +
 core/user_settings/user_setting_edit.php      |   3 +
 resources/classes/auto_loader.php             |  73 ++++++++---
 resources/classes/cache.php                   |  11 ++
 resources/classes/settings.php                | 115 +++++++++++++++---
 7 files changed, 171 insertions(+), 37 deletions(-)

diff --git a/app/sip_status/sip_status.php b/app/sip_status/sip_status.php
index 5dfb85360e..364023a108 100644
--- a/app/sip_status/sip_status.php
+++ b/app/sip_status/sip_status.php
@@ -331,4 +331,3 @@
 	require_once "resources/footer.php";
 
 ?>
-
diff --git a/core/default_settings/default_settings_reload.php b/core/default_settings/default_settings_reload.php
index 1400e7b976..916d51add7 100644
--- a/core/default_settings/default_settings_reload.php
+++ b/core/default_settings/default_settings_reload.php
@@ -46,7 +46,7 @@ $search = $_REQUEST['search'] ?? '';
 $domain_uuid = $_GET['id'] ?? null;
 
 //reload default settings
-require "resources/classes/domains.php";
+settings::clear_cache();
 $domain = new domains();
 $domain->set();
 
diff --git a/core/domain_settings/domain_setting_edit.php b/core/domain_settings/domain_setting_edit.php
index 80b8395569..e9294fd58a 100644
--- a/core/domain_settings/domain_setting_edit.php
+++ b/core/domain_settings/domain_setting_edit.php
@@ -307,6 +307,9 @@
 						}
 					}
 
+				//clear domain apcu cache due to changes
+					settings::clear_cache('domain');
+
 				//redirect the browser
 					if ($action == "update") {
 						message::add($text['message-update']);
diff --git a/core/user_settings/user_setting_edit.php b/core/user_settings/user_setting_edit.php
index b480be6f05..3e0ec3fc2f 100644
--- a/core/user_settings/user_setting_edit.php
+++ b/core/user_settings/user_setting_edit.php
@@ -298,6 +298,9 @@ if (!empty($_POST) && empty($_POST["persistformvar"])) {
 					}
 				}
 
+			//clear the user settings cache
+				settings::clear_cache('user');
+
 			//redirect the browser
 				if ($action == "update") {
 					message::add($text['message-update']);
diff --git a/resources/classes/auto_loader.php b/resources/classes/auto_loader.php
index 85dbcdb261..63042eb2d7 100644
--- a/resources/classes/auto_loader.php
+++ b/resources/classes/auto_loader.php
@@ -27,10 +27,21 @@
 class auto_loader {
 
 	const FILE = 'autoloader_cache.php';
+	const CACHE_KEY = 'autoloader_classes';
 
 	private $classes;
 
+	/**
+	 * Tracks the APCu extension for caching to RAM drive across requests
+	 * @var bool
+	 */
+	private $apcu_enabled;
+
 	public function __construct($project_path = '') {
+
+		//set if we can use RAM cache
+		$this->apcu_enabled = function_exists('apcu_enabled') && apcu_enabled();
+
 		//classes must be loaded before this object is registered
 		if (!$this->load_cache()) {
 			//cache miss so load them
@@ -43,34 +54,49 @@ class auto_loader {
 	}
 
 	public function update_cache(string $file = ''): bool {
+		//guard against writing an empty file
+		if (!empty($this->classes)) {
+			return false;
+		}
+
+		//update RAM cache when available
+		if ($this->apcu_enabled) {
+			apcu_store(self::CACHE_KEY, $this->classes);
+		}
+
 		//ensure we have somewhere to put the file
 		if (empty($file)) {
 			$file = sys_get_temp_dir() . '/' . self::FILE;
 		}
 
-		//guard against writing an empty file
-		if (!empty($this->classes)) {
-			//export the classes array using PHP engine
-			$data = var_export($this->classes, true);
+		//export the classes array using PHP engine
+		$data = var_export($this->classes, true);
 
-			//put the array in a form that it can be loaded directly to an array
-			$result = file_put_contents($file, "<?php\n return " . $data . ";\n");
-			if ($result !== false) {
-				return true;
-			}
-			$error_array = error_get_last();
-			//send to syslog when debugging
-			if (!empty($_REQUEST['debug']) && $_REQUEST['debug'] == 'true') {
-				openlog("PHP", LOG_PID | LOG_PERROR, LOG_LOCAL0);
-				syslog(LOG_WARNING, "[php][auto_loader] " . $error_array['message']);
-				closelog();
-			}
+		//put the array in a form that it can be loaded directly to an array
+		$result = file_put_contents($file, "<?php\n return " . $data . ";\n");
+		if ($result !== false) {
+			return true;
 		}
+		$error_array = error_get_last();
+		//send to syslog when debugging
+		if (!empty($_REQUEST['debug']) && $_REQUEST['debug'] == 'true') {
+			openlog("PHP", LOG_PID | LOG_PERROR, LOG_LOCAL0);
+			syslog(LOG_WARNING, "[php][auto_loader] " . $error_array['message']);
+			closelog();
+		}
+
 		return false;
 	}
 
 	public function load_cache(string $file = ''): bool {
 		$this->classes = [];
+
+		//use apcu when available
+		if ($this->apcu_enabled && apcu_exists(self::CACHE_KEY)) {
+			$this->classes = apcu_fetch(self::CACHE_KEY, $success);
+			if ($success) return true;
+		}
+
 		//use a standard file
 		if (empty($file)) {
 			$file = sys_get_temp_dir() . '/'. self::FILE;
@@ -81,6 +107,10 @@ class auto_loader {
 		}
 		//assign to an array
 		if (!empty($this->classes)) {
+			//cache edge case of first time using apcu cache
+			if ($this->apcu_enabled) {
+				apcu_store(self::CACHE_KEY, $this->classes);
+			}
 			return true;
 		}
 		return false;
@@ -125,6 +155,11 @@ class auto_loader {
 			return true;
 		}
 
+		//Smarty has it's own autoloader so reject the request
+		if ($class_name === 'Smarty_Autoloader') {
+			return false;
+		}
+
 		//cache miss
 		if (!empty($_REQUEST['debug']) && $_REQUEST['debug'] == 'true') {
 			openlog("PHP", LOG_PID | LOG_PERROR, LOG_LOCAL0);
@@ -186,4 +221,10 @@ class auto_loader {
 		}
 		return '';
 	}
+
+	public static function clear_cache() {
+		if (function_exists('apcu_enabled') && apcu_enabled()) {
+			apcu_delete(self::CACHE_KEY);
+		}
+	}
 }
diff --git a/resources/classes/cache.php b/resources/classes/cache.php
index 557d2cda63..f0ef9056ee 100644
--- a/resources/classes/cache.php
+++ b/resources/classes/cache.php
@@ -187,6 +187,17 @@ class cache {
 				closelog();
 			}
 
+		//check for apcu extension
+			if (function_exists('apcu_enabled') && apcu_enabled()) {
+				//flush everything
+				apcu_clear_cache();
+			}
+
+		//remove the autoloader file cache
+			if (file_exists(sys_get_temp_dir() . '/' . auto_loader::FILE)) {
+				@unlink(sys_get_temp_dir() . '/' . auto_loader::FILE);
+			}
+
 		//cache method memcache
 			if ($this->method === "memcache") {
 				// connect to event socket
diff --git a/resources/classes/settings.php b/resources/classes/settings.php
index b2a85e024a..3a9a21c452 100644
--- a/resources/classes/settings.php
+++ b/resources/classes/settings.php
@@ -53,6 +53,12 @@ class settings {
 	 */
 	private $database;
 
+	/**
+	 * Tracks if the APCu extension is loaded for database queries
+	 * @var bool
+	 */
+	private $apcu_enabled;
+
 	/**
 	 * Create a settings object using key/value pairs in the $setting_array.
 	 *
@@ -63,6 +69,16 @@ class settings {
 	 */
 	public function __construct($setting_array = []) {
 
+		//try to use RAM cache by default
+		if (!isset($setting_array['allow_caching'])) {
+			$setting_array['allow_caching'] = true;
+		}
+
+		//track ram caching
+		if ($setting_array['allow_caching']) {
+			$this->apcu_enabled = function_exists('apcu_enabled') && apcu_enabled();
+		}
+
 		//open a database connection
 		if (empty($setting_array['database'])) {
 			$this->database = database::new();
@@ -155,7 +171,7 @@ class settings {
 	 * @param bool $enabled (optional) True or False. Default is True.
 	 * @param string $description (optional) Description. Default is empty string.
 	 */
-	public function set(string $table_prefix, string $uuid, string $category, string $subcategory, string $type = 'text', string $value = "", bool $enabled = true, string $description = "") {
+	public function set(string $table_prefix, string $uuid, string $category, string $subcategory, string $value = "", string $type = 'text', bool $enabled = true, string $description = "") {
 
 		//set the table name
 		$table_name = $table_prefix.'_settings';
@@ -207,6 +223,15 @@ class settings {
 	 */
 	private function default_settings() {
 
+		//set the key for global defaults
+		$key = 'settings_global_' . $this->category;
+
+		//if the apcu extension is loaded get the already parsed array
+		if ($this->apcu_enabled && apcu_exists($key)) {
+			$this->settings = apcu_fetch($key);
+			return;
+		}
+
 		//get the default settings
 		$sql = "select * from v_default_settings ";
 		$sql .= "where default_setting_enabled = 'true' ";
@@ -247,7 +272,11 @@ class settings {
 				}
 			}
 		}
-		unset($sql, $result, $row);
+
+		//if the apcu extension is loaded store the result
+		if ($this->apcu_enabled) {
+			apcu_store($key, $this->settings);
+		}
 	}
 
 	/**
@@ -255,13 +284,22 @@ class settings {
 	 * @access private
 	 */
 	private function domain_settings() {
-
-		$sql = "select * from v_domain_settings ";
-		$sql .= "where domain_uuid = :domain_uuid ";
-		$sql .= "and domain_setting_enabled = 'true' ";
-		$parameters['domain_uuid'] = $this->domain_uuid;
-		$result = $this->database->select($sql, $parameters, 'all');
-		unset($sql, $parameters);
+		$key = 'settings_domain_'.$this->domain_uuid;
+		$result = '';
+		//if the apcu extension is loaded get the cached database result
+		if ($this->apcu_enabled && apcu_exists($key)) {
+			$result = apcu_fetch($key);
+		} else {
+			$sql = "select * from v_domain_settings ";
+			$sql .= "where domain_uuid = :domain_uuid ";
+			$sql .= "and domain_setting_enabled = 'true' ";
+			$parameters['domain_uuid'] = $this->domain_uuid;
+			$result = $this->database->select($sql, $parameters, 'all');
+			//if the apcu extension is loaded store the result
+			if ($this->apcu_enabled) {
+				apcu_store($key, $result);
+			}
+		}
 		if (!empty($result)) {
 			//domain setting array types override the default settings set as type array
 			foreach ($result as $row) {
@@ -305,7 +343,6 @@ class settings {
 
 			}
 		}
-		unset($result, $row);
 	}
 
 	/**
@@ -314,15 +351,25 @@ class settings {
 	 * @depends $this->domain_uuid
 	 */
 	private function user_settings() {
-
-		$sql = "select * from v_user_settings ";
-		$sql .= "where domain_uuid = :domain_uuid ";
-		$sql .= "and user_uuid = :user_uuid ";
-		$sql .= " order by user_setting_order asc ";
-		$parameters['domain_uuid'] = $this->domain_uuid;
-		$parameters['user_uuid'] = $this->user_uuid;
-		$result = $this->database->select($sql, $parameters, 'all');
-		if (is_array($result)) {
+		$key = 'settings_user_'.$this->user_uuid;
+		$result = '';
+		//if the apcu extension is loaded get the cached database result
+		if ($this->apcu_enabled && apcu_exists($key)) {
+			$result = apcu_fetch($key);
+		} else {
+			$sql = "select * from v_user_settings ";
+			$sql .= "where domain_uuid = :domain_uuid ";
+			$sql .= "and user_uuid = :user_uuid ";
+			$sql .= " order by user_setting_order asc ";
+			$parameters['domain_uuid'] = $this->domain_uuid;
+			$parameters['user_uuid'] = $this->user_uuid;
+			$result = $this->database->select($sql, $parameters, 'all');
+			//if the apcu extension is loaded store the result
+			if ($this->apcu_enabled) {
+				apcu_store($key, $result);
+			}
+		}
+		if (!empty($result)) {
 			foreach ($result as $row) {
 				if ($row['user_setting_enabled'] == 'true') {
 					$name = $row['user_setting_name'];
@@ -406,4 +453,34 @@ class settings {
 			}
 		}
 	}
+
+	/**
+	 * Clears the settings cache
+	 * @param string $type Empty clears all settings. Values can be global, domain, or user.
+	 */
+	public static function clear_cache(string $type = '') {
+		if (function_exists('apcu_enabled') && apcu_enabled()) {
+			switch ($type) {
+				case 'all':
+				case '':
+				default:
+					$type = "";
+					break;
+				case 'global':
+				case 'domain':
+				case 'user':
+					$type .= "_";
+					break;
+			}
+			$cache = apcu_cache_info(false);
+			if (!empty($cache['cache_list'])) {
+				foreach ($cache['cache_list'] as $entry) {
+					$key = $entry['info'];
+					if (str_starts_with($key, 'settings_' . $type)) {
+						apcu_delete($key);
+					}
+				}
+			}
+		}
+	}
 }

From bd54c07e50e60691f9437ef77daac5f0e0b2ed26 Mon Sep 17 00:00:00 2001
From: markjcrane <markjcrane@gmail.com>
Date: Wed, 26 Feb 2025 10:29:45 -0700
Subject: [PATCH 51/55] Move email_templates to core

---
 {app => core}/email_templates/app_config.php        |   0
 {app => core}/email_templates/app_defaults.php      |   0
 {app => core}/email_templates/app_languages.php     |   0
 {app => core}/email_templates/app_menu.php          |   0
 .../email_templates/email_template_edit.php         |   0
 {app => core}/email_templates/email_templates.php   |   0
 .../resources/classes/email_templates.php           |   0
 .../email_templates/resources/images/icon_file.png  | Bin
 .../resources/images/icon_folder.png                | Bin
 .../email_templates/resources/images/icon_gear.png  | Bin
 10 files changed, 0 insertions(+), 0 deletions(-)
 rename {app => core}/email_templates/app_config.php (100%)
 rename {app => core}/email_templates/app_defaults.php (100%)
 rename {app => core}/email_templates/app_languages.php (100%)
 rename {app => core}/email_templates/app_menu.php (100%)
 rename {app => core}/email_templates/email_template_edit.php (100%)
 rename {app => core}/email_templates/email_templates.php (100%)
 rename {app => core}/email_templates/resources/classes/email_templates.php (100%)
 rename {app => core}/email_templates/resources/images/icon_file.png (100%)
 rename {app => core}/email_templates/resources/images/icon_folder.png (100%)
 rename {app => core}/email_templates/resources/images/icon_gear.png (100%)

diff --git a/app/email_templates/app_config.php b/core/email_templates/app_config.php
similarity index 100%
rename from app/email_templates/app_config.php
rename to core/email_templates/app_config.php
diff --git a/app/email_templates/app_defaults.php b/core/email_templates/app_defaults.php
similarity index 100%
rename from app/email_templates/app_defaults.php
rename to core/email_templates/app_defaults.php
diff --git a/app/email_templates/app_languages.php b/core/email_templates/app_languages.php
similarity index 100%
rename from app/email_templates/app_languages.php
rename to core/email_templates/app_languages.php
diff --git a/app/email_templates/app_menu.php b/core/email_templates/app_menu.php
similarity index 100%
rename from app/email_templates/app_menu.php
rename to core/email_templates/app_menu.php
diff --git a/app/email_templates/email_template_edit.php b/core/email_templates/email_template_edit.php
similarity index 100%
rename from app/email_templates/email_template_edit.php
rename to core/email_templates/email_template_edit.php
diff --git a/app/email_templates/email_templates.php b/core/email_templates/email_templates.php
similarity index 100%
rename from app/email_templates/email_templates.php
rename to core/email_templates/email_templates.php
diff --git a/app/email_templates/resources/classes/email_templates.php b/core/email_templates/resources/classes/email_templates.php
similarity index 100%
rename from app/email_templates/resources/classes/email_templates.php
rename to core/email_templates/resources/classes/email_templates.php
diff --git a/app/email_templates/resources/images/icon_file.png b/core/email_templates/resources/images/icon_file.png
similarity index 100%
rename from app/email_templates/resources/images/icon_file.png
rename to core/email_templates/resources/images/icon_file.png
diff --git a/app/email_templates/resources/images/icon_folder.png b/core/email_templates/resources/images/icon_folder.png
similarity index 100%
rename from app/email_templates/resources/images/icon_folder.png
rename to core/email_templates/resources/images/icon_folder.png
diff --git a/app/email_templates/resources/images/icon_gear.png b/core/email_templates/resources/images/icon_gear.png
similarity index 100%
rename from app/email_templates/resources/images/icon_gear.png
rename to core/email_templates/resources/images/icon_gear.png

From 9591ce0cbd4da12ba16f9bc02867f02046a0596e Mon Sep 17 00:00:00 2001
From: markjcrane <markjcrane@gmail.com>
Date: Wed, 26 Feb 2025 10:30:39 -0700
Subject: [PATCH 52/55] Change the path in the menu to use core

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

diff --git a/core/email_templates/app_menu.php b/core/email_templates/app_menu.php
index 570bc8ee4d..62078d1092 100644
--- a/core/email_templates/app_menu.php
+++ b/core/email_templates/app_menu.php
@@ -29,7 +29,7 @@
 	$apps[$x]['menu'][$y]['parent_uuid'] = "594d99c5-6128-9c88-ca35-4b33392cec0f";
 	$apps[$x]['menu'][$y]['category'] = "internal";
 	$apps[$x]['menu'][$y]['icon'] = "";
-	$apps[$x]['menu'][$y]['path'] = "/app/email_templates/email_templates.php";
+	$apps[$x]['menu'][$y]['path'] = "/core/email_templates/email_templates.php";
 	$apps[$x]['menu'][$y]['order'] = "";
 	$apps[$x]['menu'][$y]['groups'][] = "superadmin";
 	$y++;

From 1fba94d92b210cdcf70f0fbdf13ba8f3546f954d Mon Sep 17 00:00:00 2001
From: FusionPBX <markjcrane@gmail.com>
Date: Wed, 26 Feb 2025 12:01:20 -0700
Subject: [PATCH 53/55] Add contact note to users

---
 core/users/app_defaults.php  |  2 +-
 core/users/app_languages.php | 28 +++++++++++++++++++++++++++-
 core/users/users.php         |  9 +++++----
 3 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/core/users/app_defaults.php b/core/users/app_defaults.php
index 75c00a25c1..66968669be 100644
--- a/core/users/app_defaults.php
+++ b/core/users/app_defaults.php
@@ -35,7 +35,7 @@ if ($domains_processed == 1) {
 
 		$sql = "CREATE VIEW view_users AS ( \n";
 		$sql .= "	select u.domain_uuid, u.user_uuid, d.domain_name, u.username, u.user_status, u.user_enabled, u.add_date, \n";
-		$sql .= "	c.contact_uuid, c.contact_organization, c.contact_name_given ||' '|| c.contact_name_family as contact_name, c.contact_name_given, c.contact_name_family, \n";
+		$sql .= "	c.contact_uuid, c.contact_organization, c.contact_name_given ||' '|| c.contact_name_family as contact_name, c.contact_name_given, c.contact_name_family, c.contact_note, \n";
 		$sql .= "	( \n";
 		$sql .= "		select \n";
 		$sql .= "		string_agg(g.group_name, ', ') \n";
diff --git a/core/users/app_languages.php b/core/users/app_languages.php
index ca0ff692f9..27cdb13300 100644
--- a/core/users/app_languages.php
+++ b/core/users/app_languages.php
@@ -1975,6 +1975,32 @@ $text['label-user_enabled']['zh-cn'] = "启用";
 $text['label-user_enabled']['ja-jp'] = "有効";
 $text['label-user_enabled']['ko-kr'] = "사용";
 
+$text['label-contact_note']['en-us'] = "Note";
+$text['label-contact_note']['en-gb'] = "Note";
+$text['label-contact_note']['ar-eg'] = "ملحوظة";
+$text['label-contact_note']['de-at'] = "Notiz";
+$text['label-contact_note']['de-ch'] = "Notiz";
+$text['label-contact_note']['de-de'] = "Notiz";
+$text['label-contact_note']['el-gr'] = "Σημείωση";
+$text['label-contact_note']['es-cl'] = "Nota";
+$text['label-contact_note']['es-mx'] = "Nota";
+$text['label-contact_note']['fr-ca'] = "Note";
+$text['label-contact_note']['fr-fr'] = "Note";
+$text['label-contact_note']['he-il'] = "הערה";
+$text['label-contact_note']['it-it'] = "Nota";
+$text['label-contact_note']['ka-ge'] = "შენიშვნა";
+$text['label-contact_note']['nl-nl'] = "Notitie";
+$text['label-contact_note']['pl-pl'] = "Notatka";
+$text['label-contact_note']['pt-br'] = "Nota";
+$text['label-contact_note']['pt-pt'] = "Nota";
+$text['label-contact_note']['ro-ro'] = "Notă";
+$text['label-contact_note']['ru-ru'] = "Примечание";
+$text['label-contact_note']['sv-se'] = "Notering";
+$text['label-contact_note']['uk-ua'] = "Нотатка";
+$text['label-contact_note']['zh-cn'] = "笔记";
+$text['label-contact_note']['ja-jp'] = "ノート";
+$text['label-contact_note']['ko-kr'] = "메모";
+
 $text['label-additional_info']['en-us'] = "Additional Info";
 $text['label-additional_info']['en-gb'] = "Additional Info";
 $text['label-additional_info']['ar-eg'] = "معلومات إضافية";
@@ -2866,4 +2892,4 @@ $text['button-permissions']['zh-cn'] = "权限";
 $text['button-permissions']['ja-jp'] = "パーミッション";
 $text['button-permissions']['ko-kr'] = "권한";
 
-?>
+?>
\ No newline at end of file
diff --git a/core/users/users.php b/core/users/users.php
index 304f6a3d32..d787de164d 100644
--- a/core/users/users.php
+++ b/core/users/users.php
@@ -113,7 +113,7 @@
 		$sql_search .= "	or lower(group_names) like :search ";
 		$sql_search .= "	or lower(contact_organization) like :search ";
 		$sql_search .= "	or lower(contact_name) like :search ";
-		//$sql_search .= "	or lower(user_status) like :search ";
+		$sql_search .= "	or lower(contact_note) like :search ";
 		$sql_search .= ") ";
 		$parameters['search'] = '%'.$search.'%';
 	}
@@ -154,7 +154,7 @@
 //get the list
 	$sql = "select domain_name, domain_uuid, user_uuid, username, group_names, ";
 	if ($show_contact_fields) {
-		$sql .= "contact_organization,contact_name, ";
+		$sql .= "contact_organization,contact_name,contact_note, ";
 	}
 	$sql .= "cast(user_enabled as text) ";
 	$sql .= "from view_users ";
@@ -267,6 +267,7 @@
 	//echo th_order_by('contact_name_family', $text['label-contact_name_family'], $order_by, $order);
 	//echo th_order_by('user_status', $text['label-user_status'], $order_by, $order);
 	//echo th_order_by('add_date', $text['label-add_date'], $order_by, $order);
+	echo th_order_by('contact_note', $text['label-contact_note'], $order_by, $order, null, "class='center'", $param);
 	echo th_order_by('user_enabled', $text['label-user_enabled'], $order_by, $order, null, "class='center'", $param);
 	if (permission_exists('user_edit') && $list_row_edit_button == 'true') {
 		echo "	<td class='action-button'>&nbsp;</td>\n";
@@ -310,6 +311,7 @@
 			//echo "	<td>".escape($row['contact_name_family'])."</td>\n";
 			//echo "	<td>".escape($row['user_status'])."</td>\n";
 			//echo "	<td>".escape($row['add_date'])."</td>\n";
+			echo "	<td>".escape($row['contact_note'])."</td>\n";
 			if (permission_exists('user_edit')) {
 				echo "	<td class='no-link center'>\n";
 				echo button::create(['type'=>'submit','class'=>'link','label'=>$text['label-'.$row['user_enabled']],'title'=>$text['button-toggle'],'onclick'=>"list_self_check('checkbox_".$x."'); list_action_set('toggle'); list_form_submit('form_list')"]);
@@ -340,5 +342,4 @@
 //include the footer
 	require_once "resources/footer.php";
 
-?>
-
+?>
\ No newline at end of file

From c3bc265ff04adf731b292daae511837b43f1c3fd Mon Sep 17 00:00:00 2001
From: FusionPBX <markjcrane@gmail.com>
Date: Wed, 26 Feb 2025 12:24:37 -0700
Subject: [PATCH 54/55] Show contact details

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

diff --git a/core/users/users.php b/core/users/users.php
index d787de164d..7f0890e625 100644
--- a/core/users/users.php
+++ b/core/users/users.php
@@ -52,21 +52,7 @@
 		$users = $_POST['users'] ?? '';
 	}
 
-//check to see if contact details are in the view
-	$sql = "select * from view_users ";
-	$sql .= "where domain_uuid = :domain_uuid ";
-	$parameters = null;
-	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
-	$row = $database->select($sql, $parameters, 'row');
-	if (isset($row['contact_organization'])) {
-		$show_contact_fields = true;
-	}
-	else {
-		$show_contact_fields = false;
-	}
-	unset($parameters);
-
-//process the http post data by action
+S//process the http post data by action
 	if (!empty($action) && is_array($users) && @sizeof($users) != 0) {
 		switch ($action) {
 			case 'copy':
@@ -153,9 +139,7 @@
 
 //get the list
 	$sql = "select domain_name, domain_uuid, user_uuid, username, group_names, ";
-	if ($show_contact_fields) {
-		$sql .= "contact_organization,contact_name,contact_note, ";
-	}
+	$sql .= "contact_organization,contact_name,contact_note, ";
 	$sql .= "cast(user_enabled as text) ";
 	$sql .= "from view_users ";
 	if ($show == "all" && permission_exists('user_all')) {
@@ -260,10 +244,8 @@
 	}
 	echo th_order_by('username', $text['label-username'], $order_by, $order, null, null, $param);
 	echo th_order_by('group_names', $text['label-groups'], $order_by, $order, null, null, $param);
-	if ($show_contact_fields) {
-		echo th_order_by('contact_organization', $text['label-organization'], $order_by, $order, null, null, $param);
-		echo th_order_by('contact_name', $text['label-name'], $order_by, $order, null, null, $param);
-	}
+	echo th_order_by('contact_organization', $text['label-organization'], $order_by, $order, null, null, $param);
+	echo th_order_by('contact_name', $text['label-name'], $order_by, $order, null, null, $param);
 	//echo th_order_by('contact_name_family', $text['label-contact_name_family'], $order_by, $order);
 	//echo th_order_by('user_status', $text['label-user_status'], $order_by, $order);
 	//echo th_order_by('add_date', $text['label-add_date'], $order_by, $order);
@@ -273,7 +255,6 @@
 		echo "	<td class='action-button'>&nbsp;</td>\n";
 	}
 	echo "</tr>\n";
-
 	if (is_array($users) && @sizeof($users) != 0) {
 		$x = 0;
 		foreach ($users as $row) {
@@ -303,10 +284,8 @@
 			}
 			echo "	</td>\n";
 			echo "	<td>".escape($row['group_names'])."</td>\n";
-			if ($show_contact_fields) {
-				echo "	<td>".escape($row['contact_organization'])."</td>\n";
-				echo "	<td>".escape($row['contact_name'])."</td>\n";
-			}
+			echo "	<td>".escape($row['contact_organization'])."</td>\n";
+			echo "	<td>".escape($row['contact_name'])."</td>\n";
 			//echo "	<td>".escape($row['contact_name_given'])."</td>\n";
 			//echo "	<td>".escape($row['contact_name_family'])."</td>\n";
 			//echo "	<td>".escape($row['user_status'])."</td>\n";

From f3986290eaf3e3b65b792da803e21ff4969c0113 Mon Sep 17 00:00:00 2001
From: FusionPBX <markjcrane@gmail.com>
Date: Thu, 27 Feb 2025 10:48:29 -0700
Subject: [PATCH 55/55] Add enable-rfc-5626 to the internal profile

---
 app/switch/resources/conf/sip_profiles/internal-ipv6.xml.noload | 2 ++
 app/switch/resources/conf/sip_profiles/internal.xml.noload      | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/app/switch/resources/conf/sip_profiles/internal-ipv6.xml.noload b/app/switch/resources/conf/sip_profiles/internal-ipv6.xml.noload
index 2c376ce0d0..f7bf02d931 100644
--- a/app/switch/resources/conf/sip_profiles/internal-ipv6.xml.noload
+++ b/app/switch/resources/conf/sip_profiles/internal-ipv6.xml.noload
@@ -11,6 +11,8 @@
 		<param name="sip-trace" value="no"/>
 		<param name="context" value="public"/>
 		<param name="rfc2833-pt" value="101"/>
+		<!-- RFC 5626 : Send reg-id and sip.instance -->
+		<param name="enable-rfc-5626" value="true" enabled="false"/>
 		<!-- port to bind to for sip traffic -->
 		<param name="sip-port" value="5060"/>
 		<param name="dialplan" value="XML"/>
diff --git a/app/switch/resources/conf/sip_profiles/internal.xml.noload b/app/switch/resources/conf/sip_profiles/internal.xml.noload
index 872de9f47c..951af3f741 100644
--- a/app/switch/resources/conf/sip_profiles/internal.xml.noload
+++ b/app/switch/resources/conf/sip_profiles/internal.xml.noload
@@ -83,6 +83,8 @@
 
 		<param name="context" value="public"/>
 		<param name="rfc2833-pt" value="101"/>
+		<!-- RFC 5626 : Send reg-id and sip.instance -->
+		<param name="enable-rfc-5626" value="true" enabled="false"/>
 		<!-- port to bind to for sip traffic -->
 		<param name="sip-port" value="5060"/>
 		<param name="dialplan" value="XML"/>