From 8b016df11fe99aa99cd626a454fe03912bae0f0a Mon Sep 17 00:00:00 2001 From: Alex <40072887+alexdcrane@users.noreply.github.com> Date: Wed, 22 Apr 2026 21:00:54 +0000 Subject: [PATCH] Phrases: Preserve query string parameters across list and edit pages (#7900) * Phrases: Preserve query string parameters across list and edit pages * Update phrase_edit.php --- app/phrases/phrase_edit.php | 36 +++++++++++-- app/phrases/phrases.php | 105 ++++++++++++++++++++---------------- 2 files changed, 89 insertions(+), 52 deletions(-) diff --git a/app/phrases/phrase_edit.php b/app/phrases/phrase_edit.php index 5ca3e8aad..6648f6843 100644 --- a/app/phrases/phrase_edit.php +++ b/app/phrases/phrase_edit.php @@ -43,6 +43,32 @@ $phrase_language = ''; $phrase_description = ''; +// Set variables from http GET parameters + $page = is_numeric($_GET['page'] ?? '') ? $_GET['page'] : 0; + $order_by = preg_replace('#[^a-zA-Z0-9_\-]#', '', ($_GET['order_by'] ?? 'phrase_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('phrase_all')) { + $param['show'] = $show; + } + $query_string = http_build_query($param); + //set the action as an add or an update if (!empty($_REQUEST["id"])) { $action = "update"; @@ -69,7 +95,7 @@ break; } - header('Location: phrases.php'); + header('Location: phrases.php'.($query_string ? '?'.$query_string : '')); exit; } @@ -99,7 +125,7 @@ $token = new token; if (!$token->validate($_SERVER['PHP_SELF'])) { message::add($text['message-invalid_token'],'negative'); - header('Location: phrases.php'); + header('Location: phrases.php'.($query_string ? '?'.$query_string : '')); exit; } @@ -179,7 +205,7 @@ //send a redirect message::add($text['message-add']); - header("Location: phrase_edit.php?id=".$phrase_uuid); + header("Location: phrase_edit.php?id=".$phrase_uuid.($query_string ? '&'.$query_string : '')); exit; } @@ -264,7 +290,7 @@ //send a redirect message::add($text['message-update']); - header("Location: phrase_edit.php?id=".$phrase_uuid); + header("Location: phrase_edit.php?id=".$phrase_uuid.($query_string ? '&'.$query_string : '')); exit;; } @@ -459,7 +485,7 @@ } echo " \n"; echo "
\n"; - echo button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>$settings->get('theme', 'button_icon_back'),'id'=>'btn_back','link'=>'phrases.php']); + echo button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>$settings->get('theme', 'button_icon_back'),'id'=>'btn_back','link'=>'phrases.php'.($query_string ? '?'.$query_string : '')]); if ($action == "update" && permission_exists('phrase_delete')) { echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$settings->get('theme', 'button_icon_delete'),'name'=>'btn_delete','style'=>'margin-left: 15px;','onclick'=>"modal_open('modal-delete','btn_delete');"]); } diff --git a/app/phrases/phrases.php b/app/phrases/phrases.php index 34786d66b..e22368d59 100644 --- a/app/phrases/phrases.php +++ b/app/phrases/phrases.php @@ -17,7 +17,7 @@ The Initial Developer of the Original Code is Mark J Crane - Portions created by the Initial Developer are Copyright (C) 2018-2025 + Portions created by the Initial Developer are Copyright (C) 2018-2026 the Initial Developer. All Rights Reserved. Contributor(s): @@ -39,16 +39,35 @@ $language = new text; $text = $language->get(); -//set the defaults - $sql_search = ''; - -//add additional variables +// Set variables from http GET parameters + $page = is_numeric($_GET['page'] ?? '') ? $_GET['page'] : 0; + $order_by = preg_replace('#[^a-zA-Z0-9_\-]#', '', ($_GET['order_by'] ?? 'phrase_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('phrase_all')) { + $param['show'] = $show; + } + $query_string = http_build_query($param); + //get posted data if (!empty($_POST['phrases'])) { $action = $_POST['action']; - $search = $_POST['search'] ?? ''; $phrases = $_POST['phrases']; } @@ -78,24 +97,10 @@ break; } - header('Location: phrases.php'.($search != '' ? '?search='.urlencode($search) : '')); + header('Location: phrases.php'.($query_string ? '?'.$query_string : '')); exit; } -//get order and order by - $order_by = $_GET["order_by"] ?? ''; - $order = $_GET["order"] ?? ''; - -//add the search term - $search = strtolower($_GET["search"] ?? ''); - if (!empty($search)) { - $sql_search = "and ("; - $sql_search .= "lower(phrase_name) like :search "; - $sql_search .= "or lower(phrase_description) like :search "; - $sql_search .= ") "; - $parameters['search'] = '%'.$search.'%'; - } - //get phrases record count $sql = "select count(*) from v_phrases "; $sql .= "where true "; @@ -103,18 +108,19 @@ $sql .= "and (domain_uuid = :domain_uuid or domain_uuid is null) "; $parameters['domain_uuid'] = $_SESSION['domain_uuid']; } - $sql .= $sql_search; + if (!empty($search)) { + $sql .= "and ("; + $sql .= " lower(phrase_name) like :search "; + $sql .= " or lower(phrase_description) like :search "; + $sql .= ") "; + $parameters['search'] = '%'.lower_case($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('phrase_all')) { - $param .= "&show=all"; - } - $page = isset($_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 @@ -131,7 +137,13 @@ $sql .= "and (domain_uuid = :domain_uuid or domain_uuid is null) "; $parameters['domain_uuid'] = $_SESSION['domain_uuid']; } - $sql .= $sql_search; + if (!empty($search)) { + $sql .= "and ("; + $sql .= " lower(phrase_name) like :search "; + $sql .= " or lower(phrase_description) like :search "; + $sql .= ") "; + $parameters['search'] = '%'.lower_case($search).'%'; + } $sql .= order_by($order_by, $order, 'phrase_name', 'asc'); $sql .= limit_offset($rows_per_page, $offset); $phrases = $database->select($sql, $parameters ?? null, 'all'); @@ -150,7 +162,7 @@ echo "
".$text['header_phrases']."
".number_format($num_rows)."
\n"; echo "
\n"; if (permission_exists('phrase_add')) { - echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$settings->get('theme', 'button_icon_add'),'id'=>'btn_add','link'=>'phrase_edit.php']); + echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$settings->get('theme', 'button_icon_add'),'id'=>'btn_add','link'=>'phrase_edit.php'.($query_string ? '?'.$query_string : '')]); } if (permission_exists('phrase_add') && $phrases) { echo button::create(['type'=>'button','label'=>$text['button-copy'],'icon'=>$settings->get('theme', 'button_icon_copy'),'id'=>'btn_copy','name'=>'btn_copy','style'=>'display: none;','onclick'=>"modal_open('modal-copy','btn_copy');"]); @@ -161,20 +173,20 @@ if (permission_exists('phrase_delete') && $phrases) { 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 "\n"; echo "
\n"; @@ -196,7 +208,6 @@ echo "
\n"; echo "\n"; - echo "\n"; echo "
\n"; echo "\n"; @@ -207,12 +218,12 @@ echo " \n"; } if ($show == "all" && permission_exists('phrase_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('phrase_name', $text['label-name'], $order_by, $order); - echo th_order_by('phrase_language', $text['label-language'], $order_by, $order); - echo th_order_by('phrase_enabled', $text['label-enabled'], $order_by, $order, null, "class='center'"); - echo th_order_by('phrase_description', $text['label-description'], $order_by, $order, null, "class='hide-sm-dn' style='min-width: 40%;'"); + echo th_order_by('phrase_name', $text['label-name'], $order_by, $order, null, null, $query_string); + echo th_order_by('phrase_language', $text['label-language'], $order_by, $order, null, null, $query_string); + echo th_order_by('phrase_enabled', $text['label-enabled'], $order_by, $order, null, "class='center'", $query_string); + echo th_order_by('phrase_description', $text['label-description'], $order_by, $order, null, "class='hide-sm-dn' style='min-width: 40%;'", $query_string); if (permission_exists('phrase_edit') && $settings->get('theme', 'list_row_edit_button', false)) { echo " \n"; } @@ -223,7 +234,7 @@ foreach($phrases as $row) { $list_row_url = ''; if (permission_exists('phrase_edit')) { - $list_row_url = "phrase_edit.php?id=".urlencode($row['phrase_uuid']); + $list_row_url = "phrase_edit.php?id=".urlencode($row['phrase_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'; }