From dc3670bc91c963c32deca9b9eae029778e62c99a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 13 Jan 2022 11:00:52 +0100 Subject: [PATCH 1/2] Clean search_status --- htdocs/compta/paiement/list.php | 1 - htdocs/expedition/list.php | 2 +- htdocs/reception/list.php | 2 +- htdocs/societe/website.php | 2 -- 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php index b52e4a3f554..3d38f97b687 100644 --- a/htdocs/compta/paiement/list.php +++ b/htdocs/compta/paiement/list.php @@ -293,7 +293,6 @@ print ''; print ''; print ''; print ''; -print ''; print ''; print_barre_liste($langs->trans("ReceivedCustomersPayments"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'bill', 0, '', '', $limit, 0, 0, 1); diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php index 79ed3b52215..d4f91a24466 100644 --- a/htdocs/expedition/list.php +++ b/htdocs/expedition/list.php @@ -94,7 +94,7 @@ $offset = $limit * $page; $pageprev = $page - 1; $pagenext = $page + 1; -$search_status = GETPOST('search_status'); +$search_status = GETPOST('search_status', 'intcomma'); $diroutputmassaction = $conf->expedition->dir_output.'/sending/temp/massgeneration/'.$user->id; diff --git a/htdocs/reception/list.php b/htdocs/reception/list.php index 2d6600dcc45..8f07d1bede7 100644 --- a/htdocs/reception/list.php +++ b/htdocs/reception/list.php @@ -75,7 +75,7 @@ $pagenext = $page + 1; // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context $contextpage = 'receptionlist'; -$search_status = GETPOST('search_status'); +$search_status = GETPOST('search_status', 'intcomma'); $object = new Reception($db); diff --git a/htdocs/societe/website.php b/htdocs/societe/website.php index 7d79a429eea..3b2e6104409 100644 --- a/htdocs/societe/website.php +++ b/htdocs/societe/website.php @@ -43,8 +43,6 @@ $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'web $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print') -$search_status = GETPOST('search_status'); - // Security check $id = GETPOST('id', 'int') ?GETPOST('id', 'int') : GETPOST('socid', 'int'); if ($user->socid) { From 620a88b8d67fa3381b40748079a98b51796aeb34 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 13 Jan 2022 11:05:21 +0100 Subject: [PATCH 2/2] Fix param sortfield/order --- htdocs/compta/sociales/list.php | 2 +- htdocs/compta/stats/cabyprodserv.php | 4 ++-- htdocs/compta/stats/cabyuser.php | 4 ++-- htdocs/compta/stats/casoc.php | 4 ++-- htdocs/compta/stats/supplier_turnover_by_prodserv.php | 4 ++-- htdocs/compta/stats/supplier_turnover_by_thirdparty.php | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/htdocs/compta/sociales/list.php b/htdocs/compta/sociales/list.php index a4deec56715..ce379774e0a 100644 --- a/htdocs/compta/sociales/list.php +++ b/htdocs/compta/sociales/list.php @@ -61,7 +61,7 @@ $search_account = GETPOST('search_account', 'int'); $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit; $sortfield = GETPOST("sortfield", 'alpha'); -$sortorder = GETPOST("sortorder", 'alpha'); +$sortorder = GETPOST("sortorder", 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int'); if (empty($page) || $page == -1) { diff --git a/htdocs/compta/stats/cabyprodserv.php b/htdocs/compta/stats/cabyprodserv.php index 021bffe40b4..084516c52df 100644 --- a/htdocs/compta/stats/cabyprodserv.php +++ b/htdocs/compta/stats/cabyprodserv.php @@ -52,8 +52,8 @@ if (GETPOST("modecompta")) { $modecompta = GETPOST("modecompta"); } -$sortorder = GETPOST("sortorder", 'aZ09'); -$sortfield = GETPOST("sortfield", 'aZ09'); +$sortorder = GETPOST("sortorder", 'aZ09comma'); +$sortfield = GETPOST("sortfield", 'aZ09comma'); if (!$sortorder) { $sortorder = "asc"; } diff --git a/htdocs/compta/stats/cabyuser.php b/htdocs/compta/stats/cabyuser.php index 8e3169f1e8c..35d5028e938 100644 --- a/htdocs/compta/stats/cabyuser.php +++ b/htdocs/compta/stats/cabyuser.php @@ -51,8 +51,8 @@ if (GETPOST("modecompta")) { $modecompta = GETPOST("modecompta"); } -$sortorder = GETPOST("sortorder", 'aZ09'); -$sortfield = GETPOST("sortfield", 'aZ09'); +$sortorder = GETPOST("sortorder", 'aZ09comma'); +$sortfield = GETPOST("sortfield", 'aZ09comma'); if (!$sortorder) { $sortorder = "asc"; } diff --git a/htdocs/compta/stats/casoc.php b/htdocs/compta/stats/casoc.php index 10f7956c6b7..76dbc56beef 100644 --- a/htdocs/compta/stats/casoc.php +++ b/htdocs/compta/stats/casoc.php @@ -44,8 +44,8 @@ if (GETPOST("modecompta")) { $modecompta = GETPOST("modecompta"); } -$sortorder = GETPOST("sortorder", 'aZ09'); -$sortfield = GETPOST("sortfield", 'aZ09'); +$sortorder = GETPOST("sortorder", 'aZ09comma'); +$sortfield = GETPOST("sortfield", 'aZ09comma'); if (!$sortorder) { $sortorder = "asc"; } diff --git a/htdocs/compta/stats/supplier_turnover_by_prodserv.php b/htdocs/compta/stats/supplier_turnover_by_prodserv.php index 4e92325a323..f36383ad94b 100644 --- a/htdocs/compta/stats/supplier_turnover_by_prodserv.php +++ b/htdocs/compta/stats/supplier_turnover_by_prodserv.php @@ -36,8 +36,8 @@ if (GETPOST("modecompta")) { $modecompta = GETPOST("modecompta"); } -$sortorder = GETPOST("sortorder", 'aZ09'); -$sortfield = GETPOST("sortfield", 'aZ09'); +$sortorder = GETPOST("sortorder", 'aZ09comma'); +$sortfield = GETPOST("sortfield", 'aZ09comma'); if (!$sortorder) { $sortorder = "asc"; } diff --git a/htdocs/compta/stats/supplier_turnover_by_thirdparty.php b/htdocs/compta/stats/supplier_turnover_by_thirdparty.php index 0ea8418381d..0be2df11190 100644 --- a/htdocs/compta/stats/supplier_turnover_by_thirdparty.php +++ b/htdocs/compta/stats/supplier_turnover_by_thirdparty.php @@ -38,8 +38,8 @@ if (GETPOST("modecompta")) { $modecompta = GETPOST("modecompta"); } -$sortorder = GETPOST("sortorder", 'aZ09'); -$sortfield = GETPOST("sortfield", 'aZ09'); +$sortorder = GETPOST("sortorder", 'aZ09comma'); +$sortfield = GETPOST("sortfield", 'aZ09comma'); if (!$sortorder) { $sortorder = "asc"; }