From ea6a02d5f033f1d2e1e5feb80b2ae8919d2803e1 Mon Sep 17 00:00:00 2001
From: Alex <40072887+alexdcrane@users.noreply.github.com>
Date: Thu, 16 Apr 2026 22:55:52 +0000
Subject: [PATCH] Call Centers: Preserve query string parameters across list
 and edit pages (#7879)

* Call Centers: Preserve query string parameters across list and edit pages

* Update call_center_queue_edit.php

* Update call_center_agents.php
---
 app/call_centers/call_center_agent_edit.php |  34 +++++-
 app/call_centers/call_center_agents.php     | 129 +++++++++++---------
 app/call_centers/call_center_queue_edit.php |  35 +++++-
 app/call_centers/call_center_queues.php     | 111 +++++++++--------
 4 files changed, 189 insertions(+), 120 deletions(-)

diff --git a/app/call_centers/call_center_agent_edit.php b/app/call_centers/call_center_agent_edit.php
index 7dce3b92a..1fa8f8306 100644
--- a/app/call_centers/call_center_agent_edit.php
+++ b/app/call_centers/call_center_agent_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-2025
+	Portions created by the Initial Developer are Copyright (C) 2008-2026
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):
@@ -44,6 +44,32 @@
 	$agent_name = '';
 	$agent_password = '';
 
+// Set variables from GET parameters
+	$page = is_numeric($_GET['page'] ?? '') ? $_GET['page'] : 0;
+	$order_by = preg_replace('#[^a-zA-Z0-9_\-]#', '', ($_GET['order_by'] ?? 'agent_name'));
+	$order = ($_GET['order'] ?? '') === 'desc' ? 'desc' : 'asc';
+	$search = $_GET['search'] ?? '';
+	$show = $_GET['show'] ?? '';
+
+// Build the query string
+	$param = [];
+	if (!empty($page)) {
+		$param['page'] = $page;
+	}
+	if (!empty($_GET['order_by'])) {
+		$param['order_by'] = $order_by;
+	}
+	if (!empty($_GET['order'])) {
+		$param['order'] = $order;
+	}
+	if (!empty($search)) {
+		$param['search'] = $search;
+	}
+	if (!empty($show) && $show == 'all' && permission_exists('call_center_all')) {
+		$param['show'] = $show;
+	}
+	$query_string = http_build_query($param);
+
 //action add or update
 	if (!empty($_REQUEST["id"]) && is_uuid($_REQUEST["id"])) {
 		$action = "update";
@@ -88,7 +114,7 @@
 			$token = new token;
 			if (!$token->validate($_SERVER['PHP_SELF'])) {
 				message::add($text['message-invalid_token'],'negative');
-				header('Location: call_center_agents.php');
+				header('Location: call_center_agents.php'.($query_string ? '?'.$query_string : ''));
 				exit;
 			}
 
@@ -247,7 +273,7 @@
 				if ($action == "update") {
 					message::add($text['message-update']);
 				}
-				header("Location: call_center_agents.php");
+				header("Location: call_center_agents.php".($query_string ? '?'.$query_string : ''));
 				return;
 			}
 	} //(is_array($_POST) && empty($_POST["persistformvar"]))
@@ -339,7 +365,7 @@
 	}
 	echo 	"</div>\n";
 	echo "	<div class='actions'>\n";
-	echo button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>$settings->get('theme', 'button_icon_back'),'id'=>'btn_back','link'=>'call_center_agents.php']);
+	echo button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>$settings->get('theme', 'button_icon_back'),'id'=>'btn_back','link'=>'call_center_agents.php'.($query_string ? '?'.$query_string : '')]);
 	echo button::create(['type'=>'submit','label'=>$text['button-save'],'icon'=>$settings->get('theme', 'button_icon_save'),'id'=>'btn_save','style'=>'margin-left: 15px;']);
 	echo "	</div>\n";
 	echo "	<div style='clear: both;'></div>\n";
diff --git a/app/call_centers/call_center_agents.php b/app/call_centers/call_center_agents.php
index f19137c4a..f84c687b2 100644
--- a/app/call_centers/call_center_agents.php
+++ b/app/call_centers/call_center_agents.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-2026
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):
@@ -39,13 +39,38 @@
 	$language = new text;
 	$text = $language->get();
 
+// Set variables from GET parameters
+	$page = is_numeric($_GET['page'] ?? '') ? $_GET['page'] : 0;
+	$order_by = preg_replace('#[^a-zA-Z0-9_\-]#', '', ($_GET['order_by'] ?? 'agent_name'));
+	$order = ($_GET['order'] ?? '') === 'desc' ? 'desc' : 'asc';
+	$search = $_GET['search'] ?? '';
+	$show = $_GET['show'] ?? '';
+
+// Build the query string
+	$param = [];
+	if (!empty($page)) {
+		$param['page'] = $page;
+	}
+	if (!empty($_GET['order_by'])) {
+		$param['order_by'] = $order_by;
+	}
+	if (!empty($_GET['order'])) {
+		$param['order'] = $order;
+	}
+	if (!empty($search)) {
+		$param['search'] = $search;
+	}
+	if (!empty($show) && $show == 'all' && permission_exists('call_center_all')) {
+		$param['show'] = $show;
+	}
+	$query_string = http_build_query($param);
+
 //set from session variables
 	$list_row_edit_button = $settings->get('theme', 'list_row_edit_button', false);
 
 //get posted data
 	if (!empty($_POST['call_center_agents'])) {
 		$action = $_POST['action'];
-		$search = $_POST['search'] ?? '';
 		$call_center_agents = $_POST['call_center_agents'];
 	}
 
@@ -60,63 +85,47 @@
 				break;
 		}
 
-		header('Location: call_center_agents.php'.($search != '' ? '?search='.urlencode($search) : ''));
+		header('Location: call_center_agents.php'.($query_string ? '?'.$query_string : ''));
 		exit;
 	}
 
-//get http variables and set them to php variables
-	$order_by = $_GET["order_by"] ?? '';
-	$order = $_GET["order"] ?? '';
-
-//add the search and show variables
-	$search = $_GET["search"] ?? '';
-	$show = $_GET["show"] ?? '';
+//add the search term
+	if (!empty($search)) {
+		$sql_search = " (";
+		$sql_search .= "	lower(agent_name) like :search ";
+		$sql_search .= "	or lower(agent_id) like :search ";
+		$sql_search .= ") ";
+		$parameters['search'] = '%'.lower_case($search).'%';
+	}
 
 //get total call center agent count from the database
 	$sql = "select count(*) from v_call_center_agents ";
-	if ($show == "all" && permission_exists('call_center_all')) {
-		$sql .= "where true ";
-	}
-	else {
-		$sql .= "where (domain_uuid = :domain_uuid or domain_uuid is null) ";
+	$sql .= "where true ";
+	if ($show != "all" || !permission_exists('call_center_all')) {
+		$sql .= "and (domain_uuid = :domain_uuid or domain_uuid is null) ";
 		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 	}
-	if (!empty($search)) {
-		$sql .= "and (";
-		$sql .= "	lower(agent_name) like :search ";
-		$sql .= "	or lower(agent_id) like :search ";
-		$sql .= ") ";
-		$parameters['search'] = '%'.strtolower($search).'%';
+	if (!empty($sql_search)) {
+		$sql .= "and ".$sql_search;
 	}
 	$num_rows = $database->select($sql, $parameters ?? null, 'column');
 
 //prepare to page the results
 	$rows_per_page = $settings->get('domain', 'paging', 50);
-	$param = "&search=".urlencode($search);
-	if ($show == "all" && permission_exists('call_center_all')) {
-		$param .= "&show=all";
-	}
-	$page = !empty($_GET['page']) ? $_GET['page'] : 0;
-	list($paging_controls, $rows_per_page) = paging($num_rows, $param, $rows_per_page);
-	list($paging_controls_mini, $rows_per_page) = paging($num_rows, $param, $rows_per_page, true);
+	list($paging_controls, $rows_per_page) = paging($num_rows, $query_string, $rows_per_page);
+	list($paging_controls_mini, $rows_per_page) = paging($num_rows, $query_string, $rows_per_page, true);
 	$offset = $rows_per_page * $page;
 
 //get the list
 	$sql = "select * ";
 	$sql .= "from v_call_center_agents ";
-	if ($show == "all" && permission_exists('call_center_all')) {
-		$sql .= "where true ";
+	$sql .= "where true ";
+	if ($show != "all" || !permission_exists('call_center_all')) {
+		$sql .= "and (domain_uuid = :domain_uuid or domain_uuid is null) ";
+		$parameters['domain_uuid'] = $domain_uuid;
 	}
-	else {
-		$sql .= "where (domain_uuid = :domain_uuid or domain_uuid is null) ";
-		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
-	}
-	if (!empty($search)) {
-		$sql .= "and (";
-		$sql .= "	lower(agent_name) like :search ";
-		$sql .= "	or lower(agent_id) like :search ";
-		$sql .= ") ";
-		$parameters['search'] = '%'.strtolower($search).'%';
+	if (!empty($sql_search)) {
+		$sql .= "and ".$sql_search;
 	}
 	$sql .= order_by($order_by, $order, 'agent_name', 'asc');
 	$sql .= limit_offset($rows_per_page, $offset);
@@ -149,14 +158,14 @@
 		echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$settings->get('theme', 'button_icon_delete'),'id'=>'btn_delete','name'=>'btn_delete','style'=>'display: none;','onclick'=>"modal_open('modal-delete','btn_delete');"]);
 	}
 	echo 		"<form id='form_search' class='inline' method='get'>";
-	if (permission_exists('call_center_all')) {
-		if (!empty($_GET['show']) && $_GET['show'] == 'all') {
-			echo "		<input type='hidden' name='show' value='all'>";
-		}
-		else {
-			echo button::create(['type'=>'button','label'=>$text['button-show_all'],'icon'=>$settings->get('theme', 'button_icon_all'),'link'=>'?type=&show=all'.($search != '' ? "&search=".urlencode($search) : null)]);
+	foreach ($param as $key => $value) {
+		if ($key !== 'search' && $key !== 'page') {
+			echo "		<input type='hidden' name='".escape($key)."' value='".escape($value)."'>\n";
 		}
 	}
+	if (permission_exists('call_center_all') && (!isset($show) || $show != 'all')) {
+		echo button::create(['type'=>'button','label'=>$text['button-show_all'],'icon'=>$settings->get('theme', 'button_icon_all'),'link'=>'?type=&show=all'.($search != '' ? "&search=".urlencode($search) : null)]);
+	}
 	echo 		"<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown='list_search_reset();'>";
 	echo button::create(['label'=>$text['button-search'],'icon'=>$settings->get('theme', 'button_icon_search'),'type'=>'submit','id'=>'btn_search','style'=>($search != '' ? 'display: none;' : null)]);
 	echo button::create(['label'=>$text['button-reset'],'icon'=>$settings->get('theme', 'button_icon_reset'),'type'=>'button','id'=>'btn_reset','link'=>'call_center_agents.php','style'=>($search == '' ? 'display: none;' : null)]);
@@ -177,7 +186,6 @@
 
 	echo "<form id='form_list' method='post'>\n";
 	echo "<input type='hidden' id='action' name='action' value=''>\n";
-	echo "<input type='hidden' name='search' value=\"".escape($search)."\">\n";
 
 	echo "<div class='card'>\n";
 	echo "<table class='list'>\n";
@@ -188,19 +196,19 @@
 		echo "	</th>\n";
 	}
 	if ($show == "all" && permission_exists('call_center_all')) {
-		echo th_order_by('domain_name', $text['label-domain'], $order_by, $order, $param, "class='shrink'");
+		echo th_order_by('domain_name', $text['label-domain'], $order_by, $order, null, "class='shrink'", $query_string);
 	}
-	//echo th_order_by('domain_uuid', 'domain_uuid', $order_by, $order);
-	echo th_order_by('agent_name', $text['label-agent_name'], $order_by, $order);
-	echo th_order_by('agent_id', $text['label-agent_id'], $order_by, $order);
-	echo th_order_by('agent_type', $text['label-type'], $order_by, $order);
-	echo th_order_by('agent_call_timeout', $text['label-call_timeout'], $order_by, $order);
-	echo th_order_by('agent_contact', $text['label-contact'], $order_by, $order);
-	echo th_order_by('agent_max_no_answer', $text['label-max_no_answer'], $order_by, $order);
-	echo th_order_by('agent_status', $text['label-default_status'], $order_by, $order);
-	//echo th_order_by('agent_wrap_up_time', $text['label-wrap_up_time'], $order_by, $order);
-	//echo th_order_by('agent_reject_delay_time', $text['label-reject_delay_time'], $order_by, $order);
-	//echo th_order_by('agent_busy_delay_time', $text['label-busy_delay_time'], $order_by, $order);
+	//echo th_order_by('domain_uuid', 'domain_uuid', $order_by, $order, null, null, $query_string);
+	echo th_order_by('agent_name', $text['label-agent_name'], $order_by, $order, null, null, $query_string);
+	echo th_order_by('agent_id', $text['label-agent_id'], $order_by, $order, null, null, $query_string);
+	echo th_order_by('agent_type', $text['label-type'], $order_by, $order, null, null, $query_string);
+	echo th_order_by('agent_call_timeout', $text['label-call_timeout'], $order_by, $order, null, null, $query_string);
+	echo th_order_by('agent_contact', $text['label-contact'], $order_by, $order, null, null, $query_string);
+	echo th_order_by('agent_max_no_answer', $text['label-max_no_answer'], $order_by, $order, null, null, $query_string);
+	echo th_order_by('agent_status', $text['label-default_status'], $order_by, $order, null, null, $query_string);
+	//echo th_order_by('agent_wrap_up_time', $text['label-wrap_up_time'], $order_by, $order, null, null, $query_string);
+	//echo th_order_by('agent_reject_delay_time', $text['label-reject_delay_time'], $order_by, $order, null, null, $query_string);
+	//echo th_order_by('agent_busy_delay_time', $text['label-busy_delay_time'], $order_by, $order, null, null, $query_string);
 	if (permission_exists('call_center_agent_edit') && $list_row_edit_button) {
 		echo "	<td class='action-button'>&nbsp;</td>\n";
 	}
@@ -211,7 +219,7 @@
 		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']);
+				$list_row_url = "call_center_agent_edit.php?id=".urlencode($row['call_center_agent_uuid']).($query_string ? '&'.$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';
 				}
@@ -288,4 +296,3 @@
 	require_once "resources/footer.php";
 
 ?>
-
diff --git a/app/call_centers/call_center_queue_edit.php b/app/call_centers/call_center_queue_edit.php
index a6b6500f0..914d4a071 100644
--- a/app/call_centers/call_center_queue_edit.php
+++ b/app/call_centers/call_center_queue_edit.php
@@ -52,6 +52,33 @@
 	$queue_description = '';
 	$queue_timeout_action = '';
 
+// Set variables from GET parameters
+	$page = is_numeric($_GET['page'] ?? '') ? $_GET['page'] : 0;
+	$order_by = preg_replace('#[^a-zA-Z0-9_\-]#', '', ($_GET['order_by'] ?? 'queue_name'));
+	$order = ($_GET['order'] ?? '') === 'desc' ? 'desc' : 'asc';
+	$sort = $order_by == 'queue_extension' ? 'natural' : null;
+	$search = $_GET['search'] ?? '';
+	$show = $_GET['show'] ?? '';
+
+// Build the query string
+	$param = [];
+	if (!empty($page)) {
+		$param['page'] = $page;
+	}
+	if (!empty($_GET['order_by'])) {
+		$param['order_by'] = $order_by;
+	}
+	if (!empty($_GET['order'])) {
+		$param['order'] = $order;
+	}
+	if (!empty($search)) {
+		$param['search'] = $search;
+	}
+	if (!empty($show) && $show == 'all' && permission_exists('call_center_all')) {
+		$param['show'] = $show;
+	}
+	$query_string = http_build_query($param);
+
 //action add or update
 	if (!empty($_REQUEST["id"]) && is_uuid($_REQUEST["id"])) {
 		$action = "update";
@@ -92,7 +119,7 @@
 
 		if ($total_call_center_queues >= $settings->get('limit','call_center_queues', 0)) {
 			message::add($text['message-maximum_queues'].' '.$settings->get('limit','call_center_queues', ''), 'negative');
-			header('Location: call_center_queues.php');
+			header('Location: call_center_queues.php'.($query_string ? '?'.$query_string : ''));
 			return;
 		}
 	}
@@ -238,7 +265,7 @@
 			$token = new token;
 			if (!$token->validate($_SERVER['PHP_SELF'])) {
 				message::add($text['message-invalid_token'],'negative');
-				header('Location: call_center_queues.php');
+				header('Location: call_center_queues.php'.($query_string ? '?'.$query_string : ''));
 				exit;
 			}
 
@@ -571,7 +598,7 @@
 
 		//redirect the user
 			if (is_uuid($call_center_queue_uuid)) {
-				header("Location: call_center_queue_edit.php?id=".urlencode($call_center_queue_uuid));
+				header("Location: call_center_queue_edit.php?id=".urlencode($call_center_queue_uuid).($query_string ? '&'.$query_string : ''));
 			}
 			return;
 
@@ -834,7 +861,7 @@
 	}
 	echo 	"</div>\n";
 	echo "	<div class='actions'>\n";
-	echo button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>$settings->get('theme','button_icon_back', ''),'id'=>'btn_back','style'=>'margin-right: 15px;','link'=>'call_center_queues.php']);
+	echo button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>$settings->get('theme','button_icon_back', ''),'id'=>'btn_back','style'=>'margin-right: 15px;','link'=>'call_center_queues.php'.($query_string ? '?'.$query_string : '')]);
 
 	if ($action == "update") {
 		if (permission_exists('call_center_wallboard')) {
diff --git a/app/call_centers/call_center_queues.php b/app/call_centers/call_center_queues.php
index bb0731d2e..2ce06cbb6 100644
--- a/app/call_centers/call_center_queues.php
+++ b/app/call_centers/call_center_queues.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-2025
+	Portions created by the Initial Developer are Copyright (C) 2008-2026
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):
@@ -42,8 +42,32 @@
 	$language = new text;
 	$text = $language->get();
 
-//set additional variables
-	$show = $_GET["show"] ?? '';
+// Set variables from GET parameters
+	$page = is_numeric($_GET['page'] ?? '') ? $_GET['page'] : 0;
+	$order_by = preg_replace('#[^a-zA-Z0-9_\-]#', '', ($_GET['order_by'] ?? 'queue_name'));
+	$order = ($_GET['order'] ?? '') === 'desc' ? 'desc' : 'asc';
+	$sort = $order_by == 'queue_extension' ? 'natural' : null;
+	$search = $_GET['search'] ?? '';
+	$show = $_GET['show'] ?? '';
+
+// Build the query string
+	$param = [];
+	if (!empty($page)) {
+		$param['page'] = $page;
+	}
+	if (!empty($_GET['order_by'])) {
+		$param['order_by'] = $order_by;
+	}
+	if (!empty($_GET['order'])) {
+		$param['order'] = $order;
+	}
+	if (!empty($search)) {
+		$param['search'] = $search;
+	}
+	if (!empty($show) && $show == 'all' && permission_exists('call_center_all')) {
+		$param['show'] = $show;
+	}
+	$query_string = http_build_query($param);
 
 //set from session variables
 	$list_row_edit_button = $settings->get('theme', 'list_row_edit_button', false);
@@ -51,7 +75,6 @@
 //get posted data
 	if (!empty($_POST['call_center_queues']) && is_array($_POST['call_center_queues'])) {
 		$action = $_POST['action'];
-		$search = $_POST['search'] ?? '';
 		$call_center_queues = $_POST['call_center_queues'];
 	}
 
@@ -65,7 +88,7 @@
 
 		if ($total_call_center_queues >= $settings->get('limit','call_center_queues', 0)) {
 			message::add($text['message-maximum_queues'].' '.$settings->get('limit','call_center_queues', ''), 'negative');
-			header('Location: call_center_queues.php');
+			header('Location: call_center_queues.php'.($query_string ? '?'.$query_string : ''));
 			return;
 		}
 	}
@@ -87,23 +110,17 @@
 				break;
 		}
 
-		header('Location: call_center_queues.php'.($search != '' ? '?search='.urlencode($search) : ''));
+		header('Location: call_center_queues.php'.($query_string ? '?'.$query_string : ''));
 		exit;
 	}
 
-//get http variables and set as php variables
-	$order_by = $_GET["order_by"] ?? '';
-	$order = $_GET["order"] ?? '';
-	$sort = $order_by == 'queue_extension' ? 'natural' : null;
-
 //add the search term
-	$search = strtolower($_GET["search"] ?? '');
 	if (!empty($search)) {
 		$sql_search = " (";
 		$sql_search .= "lower(queue_name) like :search ";
 		$sql_search .= "or lower(queue_description) like :search ";
 		$sql_search .= ") ";
-		$parameters['search'] = '%'.$search.'%';
+		$parameters['search'] = '%'.lower_case($search).'%';
 	}
 
 //get total call center queues count from the database
@@ -120,14 +137,8 @@
 
 //prepare to page the results
 	$rows_per_page = $settings->get('domain', 'paging', 50);
-	$param = "&search=".urlencode($search);
-	if ($show == "all" && permission_exists('call_center_all')) {
-		$param .= "&show=all";
-	}
-	$page = $_GET['page'] ?? '';
-	if (empty($page)) { $page = 0; $_GET['page'] = 0; }
-	list($paging_controls, $rows_per_page) = paging($num_rows, $param, $rows_per_page);
-	list($paging_controls_mini, $rows_per_page) = paging($num_rows, $param, $rows_per_page, true);
+	list($paging_controls, $rows_per_page) = paging($num_rows, $query_string, $rows_per_page);
+	list($paging_controls_mini, $rows_per_page) = paging($num_rows, $query_string, $rows_per_page, true);
 	$offset = $rows_per_page * $page;
 
 //get the list
@@ -160,7 +171,7 @@
 	}
 	$margin_left = permission_exists('call_center_agent_view') || permission_exists('call_center_wallboard') ? 'margin-left: 15px;' : null;
 	if (permission_exists('call_center_queue_add')) {
-		echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$settings->get('theme', 'button_icon_add'),'id'=>'btn_add','style'=>$margin_left,'link'=>'call_center_queue_edit.php']);
+		echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$settings->get('theme', 'button_icon_add'),'id'=>'btn_add','style'=>$margin_left,'link'=>'call_center_queue_edit.php'.($query_string ? '?'.$query_string : '')]);
 		unset($margin_left);
 	}
 	if (permission_exists('call_center_queue_add') && $result) {
@@ -171,20 +182,20 @@
 		echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$settings->get('theme', 'button_icon_delete'),'id'=>'btn_delete','name'=>'btn_delete','style'=>'display: none; '.!empty($margin_left),'onclick'=>"modal_open('modal-delete','btn_delete');"]);
 		unset($margin_left);
 	}
-	echo 		"<form id='form_search' class='inline' method='get'>\n";
-	if (permission_exists('call_center_all')) {
-		if ($show == 'all') {
-			echo "		<input type='hidden' name='show' value='all'>";
-		}
-		else {
-			echo button::create(['type'=>'button','label'=>$text['button-show_all'],'icon'=>$settings->get('theme', 'button_icon_all'),'link'=>'?type=&show=all'.($search != '' ? "&search=".urlencode($search) : null)]);
+	echo "		<form id='form_search' class='inline' method='get'>\n";
+	foreach ($param as $key => $value) {
+		if ($key !== 'search' && $key !== 'page') {
+			echo "		<input type='hidden' name='".escape($key)."' value='".escape($value)."'>\n";
 		}
 	}
-	echo 		"<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown=''>";
+	if (permission_exists('call_center_all') && (!isset($show) || $show != 'all')) {
+		echo button::create(['type'=>'button','label'=>$text['button-show_all'],'icon'=>$settings->get('theme', 'button_icon_all'),'link'=>'?show=all']);
+	}
+	echo "		<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown=''>";
 	echo button::create(['label'=>$text['button-search'],'icon'=>$settings->get('theme', 'button_icon_search'),'type'=>'submit','id'=>'btn_search']);
 	//echo button::create(['label'=>$text['button-reset'],'icon'=>$settings->get('theme', 'button_icon_reset'),'type'=>'button','id'=>'btn_reset','link'=>'call_center_queues.php','style'=>($search == '' ? 'display: none;' : null)]);
 	if ($paging_controls_mini != '') {
-		echo 	"<span style='margin-left: 15px;'>".$paging_controls_mini."</span>";
+		echo "	<span style='margin-left: 15px;'>".$paging_controls_mini."</span>";
 	}
 	echo "		</form>\n";
 	echo "	</div>\n";
@@ -203,7 +214,6 @@
 
 	echo "<form id='form_list' method='post'>\n";
 	echo "<input type='hidden' id='action' name='action' value=''>\n";
-	echo "<input type='hidden' name='search' value=\"".escape($search)."\">\n";
 
 	echo "<div class='card'>\n";
 	echo "<table class='list'>\n";
@@ -214,24 +224,24 @@
 		echo "	</th>\n";
 	}
 	if ($show == "all" && permission_exists('call_center_all')) {
-		echo th_order_by('domain_name', $text['label-domain'], $order_by, $order, $param, "class='shrink'");
+		echo th_order_by('domain_name', $text['label-domain'], $order_by, $order, null, "class='shrink'", $query_string);
 	}
-	echo th_order_by('queue_name', $text['label-queue_name'], $order_by, $order);
-	echo th_order_by('queue_extension', $text['label-extension'], $order_by, $order);
-	echo th_order_by('queue_strategy', $text['label-strategy'], $order_by, $order);
-	//echo th_order_by('queue_moh_sound', $text['label-music_on_hold'], $order_by, $order);
-	//echo th_order_by('queue_record_template', $text['label-record_template'], $order_by, $order);
-	//echo th_order_by('queue_time_base_score', $text['label-time_base_score'], $order_by, $order);
-	//echo th_order_by('queue_time_base_score_sec', $text['label-time_base_score_sec'], $order_by, $order);
-	//echo th_order_by('queue_max_wait_time', $text['label-max_wait_time'], $order_by, $order);
-	//echo th_order_by('queue_max_wait_time_with_no_agent', $text['label-max_wait_time_with_no_agent'], $order_by, $order);
-	echo th_order_by('queue_tier_rules_apply', $text['label-tier_rules_apply'], $order_by, $order);
-	//echo th_order_by('queue_tier_rule_wait_second', $text['label-tier_rule_wait_second'], $order_by, $order);
-	//echo th_order_by('queue_tier_rule_no_agent_no_wait', $text['label-tier_rule_no_agent_no_wait'], $order_by, $order);
-	//echo th_order_by('queue_discard_abandoned_after', $text['label-discard_abandoned_after'], $order_by, $order);
-	//echo th_order_by('queue_abandoned_resume_allowed', $text['label-abandoned_resume_allowed'], $order_by, $order);
-	//echo th_order_by('queue_tier_rule_wait_multiply_level', $text['label-tier_rule_wait_multiply_level'], $order_by, $order);
-	echo th_order_by('queue_description', $text['label-description'], $order_by, $order, null, "class='hide-sm-dn'");
+	echo th_order_by('queue_name', $text['label-queue_name'], $order_by, $order, null, null, $query_string);
+	echo th_order_by('queue_extension', $text['label-extension'], $order_by, $order, null, null, $query_string);
+	echo th_order_by('queue_strategy', $text['label-strategy'], $order_by, $order, null, null, $query_string);
+	//echo th_order_by('queue_moh_sound', $text['label-music_on_hold'], $order_by, $order, null, null, $query_string);
+	//echo th_order_by('queue_record_template', $text['label-record_template'], $order_by, $order, null, null, $query_string);
+	//echo th_order_by('queue_time_base_score', $text['label-time_base_score'], $order_by, $order, null, null, $query_string);
+	//echo th_order_by('queue_time_base_score_sec', $text['label-time_base_score_sec'], $order_by, $order, null, null, $query_string);
+	//echo th_order_by('queue_max_wait_time', $text['label-max_wait_time'], $order_by, $order, null, null, $query_string);
+	//echo th_order_by('queue_max_wait_time_with_no_agent', $text['label-max_wait_time_with_no_agent'], $order_by, $order, null, null, $query_string);
+	echo th_order_by('queue_tier_rules_apply', $text['label-tier_rules_apply'], $order_by, $order, null, null, $query_string);
+	//echo th_order_by('queue_tier_rule_wait_second', $text['label-tier_rule_wait_second'], $order_by, $order, null, null, $query_string);
+	//echo th_order_by('queue_tier_rule_no_agent_no_wait', $text['label-tier_rule_no_agent_no_wait'], $order_by, $order, null, null, $query_string);
+	//echo th_order_by('queue_discard_abandoned_after', $text['label-discard_abandoned_after'], $order_by, $order, null, null, $query_string);
+	//echo th_order_by('queue_abandoned_resume_allowed', $text['label-abandoned_resume_allowed'], $order_by, $order, null, null, $query_string);
+	//echo th_order_by('queue_tier_rule_wait_multiply_level', $text['label-tier_rule_wait_multiply_level'], $order_by, $order, null, null, $query_string);
+	echo th_order_by('queue_description', $text['label-description'], $order_by, $order, null, "class='hide-sm-dn'", $query_string);
 	if (permission_exists('call_center_queue_edit') && $list_row_edit_button) {
 		echo "	<td class='action-button'>&nbsp;</td>\n";
 	}
@@ -242,7 +252,7 @@
 		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']);
+				$list_row_url = "call_center_queue_edit.php?id=".urlencode($row['call_center_queue_uuid']).($query_string ? '&'.$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';
 				}
@@ -310,4 +320,3 @@
 	require_once "resources/footer.php";
 
 ?>
-