From e390c8a10de25405d4b4ecfb04f39644b14fac9e Mon Sep 17 00:00:00 2001 From: Alex <40072887+alexdcrane@users.noreply.github.com> Date: Mon, 20 Apr 2026 21:05:10 +0000 Subject: [PATCH] Conference Profiles: Preserve query string parameters across list and edit pages (#7891) * Conference Profiles: Preserve query string parameters across list and edit pages * Update conference_profile_params.php * Update conference_profile_param_edit.php * Update conference_profile_edit.php --- .../conference_profile_edit.php | 33 +++++++- .../conference_profile_param_edit.php | 30 ++++++- .../conference_profile_params.php | 60 +++++++------- .../conference_profiles.php | 78 +++++++++++-------- 4 files changed, 136 insertions(+), 65 deletions(-) diff --git a/app/conference_profiles/conference_profile_edit.php b/app/conference_profiles/conference_profile_edit.php index 746fb9a46..db5993389 100644 --- a/app/conference_profiles/conference_profile_edit.php +++ b/app/conference_profiles/conference_profile_edit.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): @@ -42,6 +42,31 @@ $profile_name = ''; $profile_description = ''; +// Set variables from GET parameters + $page = is_numeric($_GET['page'] ?? '') ? $_GET['page'] : 0; + $order_by = preg_replace('#[^a-zA-Z0-9_\-]#', '', ($_GET['order_by'] ?? 'profile_name')); + $order = ($_GET['order'] ?? '') === 'desc' ? 'desc' : 'asc'; + $search = $_GET['search'] ?? ''; + +// 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; + } + $query_string = http_build_query($param); + +//set from session variables + $list_row_edit_button = $settings->get('theme', 'list_row_edit_button', false); + //action add or update if (!empty($_REQUEST["id"]) && is_uuid($_REQUEST["id"])) { $action = "update"; @@ -69,7 +94,7 @@ $token = new token; if (!$token->validate($_SERVER['PHP_SELF'])) { message::add($text['message-invalid_token'],'negative'); - header('Location: conference_profiles.php'); + header('Location: conference_profiles.php'.($query_string ? '?'.$query_string : '')); exit; } @@ -114,7 +139,7 @@ unset($array); } - header("Location: conference_profiles.php"); + header("Location: conference_profiles.php".($query_string ? '?'.$query_string : '')); exit; } @@ -158,7 +183,7 @@ echo "
\n"; echo "
".$text['title-conference_profile']."
\n"; echo "
\n"; - echo button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>$settings->get('theme', 'button_icon_back'),'id'=>'btn_back','collapse'=>'hide-xs','style'=>'margin-right: 15px;','link'=>'conference_profiles.php']); + echo button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>$settings->get('theme', 'button_icon_back'),'id'=>'btn_back','collapse'=>'hide-xs','style'=>'margin-right: 15px;','link'=>'conference_profiles.php'.($query_string ? '?'.$query_string : '')]); echo button::create(['type'=>'submit','label'=>$text['button-save'],'icon'=>$settings->get('theme', 'button_icon_save'),'id'=>'btn_save','collapse'=>'hide-xs']); echo "
\n"; echo "
\n"; diff --git a/app/conference_profiles/conference_profile_param_edit.php b/app/conference_profiles/conference_profile_param_edit.php index 72bd8eaa2..cf35ead5a 100644 --- a/app/conference_profiles/conference_profile_param_edit.php +++ b/app/conference_profiles/conference_profile_param_edit.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): @@ -43,6 +43,28 @@ $profile_param_value = ''; $profile_param_description = ''; +// Set variables from GET parameters + $page = is_numeric($_GET['page'] ?? '') ? $_GET['page'] : 0; + $order_by = preg_replace('#[^a-zA-Z0-9_\-]#', '', ($_GET['order_by'] ?? '')); + $order = ($_GET['order'] ?? '') === 'desc' ? 'desc' : 'asc'; + $search = $_GET['search'] ?? ''; + +// 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; + } + $query_string = http_build_query($param); + //action add or update if (!empty($_REQUEST["id"]) && is_uuid($_REQUEST["id"])) { $action = "update"; @@ -77,7 +99,7 @@ $token = new token; if (!$token->validate($_SERVER['PHP_SELF'])) { message::add($text['message-invalid_token'],'negative'); - header('Location: conference_profiles.php'); + header('Location: conference_profiles.php'.($query_string ? '?'.$query_string : '')); exit; } @@ -124,7 +146,7 @@ unset($array); } - header('Location: conference_profile_edit.php?id='.$conference_profile_uuid); + header('Location: conference_profile_edit.php?id='.$conference_profile_uuid.($query_string ? '&'.$query_string : '')); exit; } @@ -168,7 +190,7 @@ echo "
\n"; echo "
".$text['title-conference_profile_param']."
\n"; echo "
\n"; - echo button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>$settings->get('theme', 'button_icon_back'),'id'=>'btn_back','collapse'=>'hide-xs','style'=>'margin-right: 15px;','link'=>'conference_profile_edit.php?id='.urlencode($conference_profile_uuid)]); + echo button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>$settings->get('theme', 'button_icon_back'),'id'=>'btn_back','collapse'=>'hide-xs','style'=>'margin-right: 15px;','link'=>'conference_profile_edit.php?id='.urlencode($conference_profile_uuid).($query_string ? '&'.$query_string : '')]); echo button::create(['type'=>'submit','label'=>$text['button-save'],'icon'=>$settings->get('theme', 'button_icon_save'),'id'=>'btn_save','collapse'=>'hide-xs']); echo "
\n"; echo "
\n"; diff --git a/app/conference_profiles/conference_profile_params.php b/app/conference_profiles/conference_profile_params.php index f048c70de..3ba47e67b 100644 --- a/app/conference_profiles/conference_profile_params.php +++ b/app/conference_profiles/conference_profile_params.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,6 +39,28 @@ $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'] ?? '')); + $order = ($_GET['order'] ?? '') === 'desc' ? 'desc' : 'asc'; + $search = $_GET['search'] ?? ''; + +// 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; + } + $query_string = http_build_query($param); + //set from session variables $list_row_edit_button = $settings->get('theme', 'list_row_edit_button', false); @@ -68,14 +90,10 @@ break; } - header('Location: conference_profile_edit.php?id='.urlencode($conference_profile_uuid)); + header('Location: conference_profile_edit.php?id='.urlencode($conference_profile_uuid).($query_string ? '&'.$query_string : '')); exit; } -//get variables used to control the order - $order_by = $_GET["order_by"] ?? ''; - $order = $_GET["order"] ?? ''; - //prepare to page the results $sql = "select count(conference_profile_param_uuid) "; $sql .= "from v_conference_profile_params "; @@ -84,15 +102,6 @@ $num_rows = $database->select($sql, $parameters, 'column'); unset($sql, $parameters); -//prepare to page the results - $rows_per_page = $settings->get('domain', 'paging', 50); - $param = "&id=".$conference_profile_uuid; - if (isset($_GET['page'])) { - $page = isset($_GET['page']) ? $_GET['page'] : 0; - list($paging_controls, $rows_per_page) = paging($num_rows, $param, $rows_per_page); - $offset = $rows_per_page * $page; - } - //get the list $sql = "select "; $sql .= "conference_profile_param_uuid, "; @@ -104,8 +113,7 @@ $sql .= "from v_conference_profile_params "; $sql .= "where conference_profile_uuid = :conference_profile_uuid "; $parameters['conference_profile_uuid'] = $conference_profile_uuid; - $sql .= order_by($order_by, $order, 'profile_param_name', 'asc'); - $sql .= limit_offset($rows_per_page ?? '', $offset ?? ''); + $sql .= order_by(null, null, 'profile_param_name', 'asc'); $result = $database->select($sql, $parameters ?? null, 'all'); unset($sql, $parameters); @@ -117,9 +125,9 @@ echo "
\n"; echo "
".$text['title-conference_profile_params']."
".number_format($num_rows)."
\n"; echo "
\n"; - echo button::create(['type'=>'button','id'=>'action_bar_sub_button_back','label'=>$text['button-back'],'icon'=>$settings->get('theme', 'button_icon_back'),'collapse'=>'hide-xs','style'=>'margin-right: 15px; display: none;','link'=>'conference_profiles.php']); + echo button::create(['type'=>'button','id'=>'action_bar_sub_button_back','label'=>$text['button-back'],'icon'=>$settings->get('theme', 'button_icon_back'),'collapse'=>'hide-xs','style'=>'margin-right: 15px; display: none;','link'=>'conference_profiles.php'.($query_string ? '?'.$query_string : '')]); if (permission_exists('conference_profile_param_add')) { - echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$settings->get('theme', 'button_icon_add'),'id'=>'btn_add','collapse'=>'hide-xs','link'=>'conference_profile_param_edit.php?conference_profile_uuid='.escape($_GET['id'])]); + echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$settings->get('theme', 'button_icon_add'),'id'=>'btn_add','collapse'=>'hide-xs','link'=>'conference_profile_param_edit.php?conference_profile_uuid='.escape($_GET['id']).($query_string ? '&'.$query_string : '')]); } if (permission_exists('conference_profile_param_edit') && $result) { echo button::create(['type'=>'button','label'=>$text['button-toggle'],'icon'=>$settings->get('theme', 'button_icon_toggle'),'name'=>'btn_toggle','collapse'=>'hide-xs','onclick'=>"modal_open('modal-toggle','btn_toggle');"]); @@ -141,7 +149,7 @@ echo $text['title_description-conference_profile_param']."\n"; echo "

\n"; - echo "
\n"; + echo "\n"; echo "\n"; echo "\n"; @@ -153,10 +161,10 @@ echo " \n"; echo " \n"; } - echo th_order_by('profile_param_name', $text['label-profile_param_name'], $order_by, $order, null, null, $param); - echo th_order_by('profile_param_value', $text['label-profile_param_value'], $order_by, $order, null, "class='pct-40'", $param); - echo th_order_by('profile_param_enabled', $text['label-profile_param_enabled'], $order_by, $order, null, "class='center'", $param); - echo th_order_by('profile_param_description', $text['label-profile_param_description'], $order_by, $order, null, "class='hide-sm-dn'", $param); + echo " ".$text['label-profile_param_name']."\n"; + echo " ".$text['label-profile_param_value']."\n"; + echo " ".$text['label-profile_param_enabled']."\n"; + echo " ".$text['label-profile_param_description']."\n"; if (permission_exists('conference_profile_param_edit') && $list_row_edit_button) { echo "  \n"; } @@ -166,7 +174,7 @@ $x = 0; foreach ($result as $row) { if (permission_exists('conference_profile_param_edit')) { - $list_row_url = 'conference_profile_param_edit.php?conference_profile_uuid='.urlencode($row['conference_profile_uuid']).'&id='.urlencode($row['conference_profile_param_uuid']); + $list_row_url = 'conference_profile_param_edit.php?conference_profile_uuid='.urlencode($row['conference_profile_uuid']).'&id='.urlencode($row['conference_profile_param_uuid']).($query_string ? '&'.$query_string : $query_string); } echo "\n"; if (permission_exists('conference_profile_param_edit') || permission_exists('conference_profile_param_delete')) { @@ -208,7 +216,7 @@ echo "\n"; echo "
\n"; echo "
\n"; - echo "
".!empty($paging_controls)."
\n"; + echo "\n"; echo "\n"; diff --git a/app/conference_profiles/conference_profiles.php b/app/conference_profiles/conference_profiles.php index 1256c14e4..6f7662281 100644 --- a/app/conference_profiles/conference_profiles.php +++ b/app/conference_profiles/conference_profiles.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): @@ -38,8 +38,27 @@ $language = new text; $text = $language->get(); -//set additional variables - $search = $_GET["search"] ?? ''; +// Set variables from GET parameters + $page = is_numeric($_GET['page'] ?? '') ? $_GET['page'] : 0; + $order_by = preg_replace('#[^a-zA-Z0-9_\-]#', '', ($_GET['order_by'] ?? 'profile_name')); + $order = ($_GET['order'] ?? '') === 'desc' ? 'desc' : 'asc'; + $search = $_GET['search'] ?? ''; + +// 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; + } + $query_string = http_build_query($param); //set from session variables $list_row_edit_button = $settings->get('theme', 'list_row_edit_button', false); @@ -47,7 +66,6 @@ //get the http post data if (!empty($_POST['conference_profiles'])) { $action = $_POST['action']; - $search = $_POST['search'] ?? ''; $conference_profiles = $_POST['conference_profiles']; } @@ -74,28 +92,18 @@ break; } - header('Location: conference_profiles.php'.(!empty($search) ? '?search='.urlencode($search) : '')); + header('Location: conference_profiles.php'.($query_string ? '?'.$query_string : '')); exit; } -//get order and order by - $order_by = $_GET["order_by"] ?? ''; - $order = $_GET["order"] ?? ''; - -//add the search string - if (isset($_GET["search"])) { - $search = strtolower($_GET["search"]); - $sql_search = " ("; - $sql_search .= " lower(profile_name) like :search "; - $sql_search .= " or lower(profile_description) like :search "; - $sql_search .= ") "; - $parameters['search'] = '%'.$search.'%'; - } - //get the count $sql = "select count(conference_profile_uuid) from v_conference_profiles "; - if (isset($sql_search)) { - $sql .= "where ".$sql_search; + if (!empty($search)) { + $sql .= "where ("; + $sql .= " lower(profile_name) like :search "; + $sql .= " or lower(profile_description) like :search "; + $sql .= ") "; + $parameters['search'] = '%'.lower_case($search).'%'; } $num_rows = $database->select($sql, $parameters ?? null, 'column'); unset($sql); @@ -107,8 +115,12 @@ $sql .= "cast(profile_enabled as text), "; $sql .= "profile_description "; $sql .= "from v_conference_profiles "; - if (!empty($sql_search)) { - $sql .= "where ".$sql_search; + if (!empty($search)) { + $sql .= "where ("; + $sql .= " lower(profile_name) like :search "; + $sql .= " or lower(profile_description) like :search "; + $sql .= ") "; + $parameters['search'] = '%'.lower_case($search).'%'; } $sql .= order_by($order_by, $order, 'profile_name', 'asc'); $sql .= limit_offset($rows_per_page ?? '', $offset ?? ''); @@ -128,7 +140,7 @@ echo "
".$text['title-conference_profiles']."
".number_format($num_rows)."
\n"; echo "
\n"; if (permission_exists('conference_profile_add')) { - echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$settings->get('theme', 'button_icon_add'),'id'=>'btn_add','link'=>'conference_profile_edit.php']); + echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$settings->get('theme', 'button_icon_add'),'id'=>'btn_add','link'=>'conference_profile_edit.php'.($query_string ? '?'.$query_string : '')]); } if (permission_exists('conference_profile_add') && $conference_profiles) { 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');"]); @@ -139,12 +151,17 @@ if (permission_exists('conference_profile_delete') && $conference_profiles) { 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"; @@ -166,7 +183,6 @@ echo "
\n"; echo "\n"; - echo "\n"; echo "
\n"; echo "\n"; @@ -176,8 +192,8 @@ echo " \n"; echo " \n"; } - echo th_order_by('profile_name', $text['label-profile_name'], $order_by, $order); - echo th_order_by('profile_enabled', $text['label-profile_enabled'], $order_by, $order, null, "class='center'"); + echo th_order_by('profile_name', $text['label-profile_name'], $order_by, $order, null, null, $query_string); + echo th_order_by('profile_enabled', $text['label-profile_enabled'], $order_by, $order, null, "class='center'", $query_string); echo " \n"; if (permission_exists('conference_profile_edit') && $list_row_edit_button) { echo " \n"; @@ -188,7 +204,7 @@ $x = 0; foreach ($conference_profiles as $row) { if (permission_exists('conference_profile_edit')) { - $list_row_url = "conference_profile_edit.php?id=".urlencode($row['conference_profile_uuid']); + $list_row_url = "conference_profile_edit.php?id=".urlencode($row['conference_profile_uuid']).($query_string ? '&'.$query_string : ''); } echo "\n"; if (permission_exists('conference_profile_add') || permission_exists('conference_profile_edit') || permission_exists('conference_profile_delete')) {
".$text['label-profile_description']."