From 79aa9fb1f163e9603a2d2569bc2aed61b6d26882 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 15 Mar 2024 20:29:21 +0100 Subject: [PATCH] Code simpler --- htdocs/accountancy/admin/account.php | 2 +- htdocs/accountancy/admin/categories.php | 2 +- htdocs/accountancy/admin/fiscalyear.php | 2 +- htdocs/accountancy/admin/subaccount.php | 2 +- htdocs/accountancy/bookkeeping/balance.php | 2 +- htdocs/adherents/agenda.php | 2 +- htdocs/adherents/document.php | 2 +- htdocs/adherents/list.php | 2 +- htdocs/adherents/subscription.php | 2 +- htdocs/adherents/subscription/list.php | 2 +- htdocs/adherents/type.php | 2 +- htdocs/admin/const.php | 2 +- htdocs/admin/defaultvalues.php | 2 +- htdocs/admin/emailcollector_list.php | 2 +- htdocs/admin/events.php | 2 +- htdocs/admin/mails_senderprofile_list.php | 2 +- htdocs/admin/mails_templates.php | 2 +- htdocs/admin/tools/dolibarr_export.php | 2 +- htdocs/admin/tools/export.php | 2 +- htdocs/admin/tools/export_files.php | 2 +- htdocs/admin/tools/listevents.php | 2 +- htdocs/admin/tools/listsessions.php | 2 +- htdocs/admin/translation.php | 2 +- htdocs/admin/website.php | 2 +- htdocs/admin/website_options.php | 2 +- htdocs/asset/agenda.php | 2 +- htdocs/asset/document.php | 2 +- htdocs/asset/list.php | 2 +- htdocs/asset/model/agenda.php | 2 +- htdocs/asset/model/list.php | 2 +- htdocs/blockedlog/admin/blockedlog_list.php | 2 +- htdocs/bom/bom_agenda.php | 2 +- htdocs/bom/bom_document.php | 2 +- htdocs/bom/bom_list.php | 2 +- htdocs/bookcal/availabilities_agenda.php | 2 +- htdocs/bookcal/availabilities_document.php | 2 +- htdocs/bookcal/availabilities_list.php | 2 +- htdocs/bookcal/calendar_agenda.php | 2 +- htdocs/bookcal/calendar_document.php | 2 +- htdocs/bookcal/calendar_list.php | 2 +- htdocs/bookmarks/list.php | 2 +- htdocs/categories/viewcat.php | 2 +- htdocs/comm/action/document.php | 2 +- htdocs/comm/action/index.php | 2 +- htdocs/comm/action/list.php | 2 +- htdocs/comm/action/pertype.php | 2 +- htdocs/comm/action/peruser.php | 2 +- htdocs/comm/action/rapport/index.php | 2 +- htdocs/comm/card.php | 2 +- htdocs/comm/contact.php | 2 +- htdocs/comm/mailing/advtargetemailing.php | 2 +- htdocs/comm/mailing/cibles.php | 2 +- htdocs/comm/propal/agenda.php | 2 +- htdocs/comm/propal/document.php | 2 +- htdocs/comm/propal/list.php | 2 +- htdocs/commande/agenda.php | 2 +- htdocs/commande/customer.php | 2 +- htdocs/commande/document.php | 2 +- htdocs/commande/list.php | 2 +- htdocs/commande/list_det.php | 2 +- htdocs/compta/accounting-files.php | 2 +- htdocs/compta/bank/account_statement_document.php | 2 +- htdocs/compta/bank/bankentries_list.php | 2 +- htdocs/compta/bank/document.php | 2 +- htdocs/compta/bank/list.php | 2 +- htdocs/compta/bank/releve.php | 2 +- htdocs/compta/bank/various_payment/document.php | 2 +- htdocs/compta/bank/various_payment/list.php | 2 +- htdocs/compta/cashcontrol/cashcontrol_card.php | 2 +- htdocs/compta/cashcontrol/cashcontrol_list.php | 2 +- htdocs/compta/charges/index.php | 2 +- htdocs/compta/clients.php | 2 +- htdocs/compta/deplacement/document.php | 2 +- htdocs/compta/deplacement/index.php | 4 ++-- htdocs/compta/deplacement/list.php | 2 +- htdocs/compta/facture/agenda-rec.php | 2 +- htdocs/compta/facture/agenda.php | 2 +- htdocs/compta/facture/card-rec.php | 2 +- htdocs/compta/facture/document.php | 2 +- htdocs/compta/facture/invoicetemplate_list.php | 2 +- htdocs/compta/facture/list.php | 2 +- htdocs/compta/paiement.php | 2 +- htdocs/compta/paiement/cheque/card.php | 2 +- htdocs/compta/paiement/cheque/list.php | 2 +- htdocs/compta/paiement/list.php | 2 +- htdocs/compta/paiement/tovalidate.php | 2 +- htdocs/compta/prelevement/card.php | 2 +- htdocs/compta/prelevement/create.php | 2 +- htdocs/compta/prelevement/demandes.php | 2 +- htdocs/compta/prelevement/factures.php | 2 +- htdocs/compta/prelevement/fiche-rejet.php | 2 +- htdocs/compta/prelevement/fiche-stat.php | 2 +- htdocs/compta/prelevement/line.php | 2 +- htdocs/compta/prelevement/list.php | 2 +- htdocs/compta/prelevement/orders_list.php | 2 +- htdocs/compta/prelevement/rejets.php | 2 +- htdocs/compta/recap-compta.php | 2 +- htdocs/compta/resultat/clientfourn.php | 2 +- htdocs/compta/sociales/document.php | 2 +- htdocs/compta/sociales/list.php | 2 +- htdocs/compta/sociales/payments.php | 2 +- htdocs/compta/tva/document.php | 2 +- htdocs/compta/tva/list.php | 2 +- htdocs/compta/tva/payments.php | 2 +- htdocs/contact/agenda.php | 2 +- htdocs/contact/consumption.php | 2 +- htdocs/contact/document.php | 2 +- htdocs/contact/list.php | 2 +- htdocs/contrat/agenda.php | 2 +- htdocs/contrat/document.php | 2 +- htdocs/contrat/list.php | 2 +- htdocs/contrat/messaging.php | 2 +- htdocs/contrat/services_list.php | 2 +- htdocs/core/ajax/ajaxdirpreview.php | 2 +- htdocs/core/customreports.php | 2 +- htdocs/core/modules/movement/doc/pdf_standard.modules.php | 2 +- htdocs/cron/list.php | 2 +- htdocs/don/document.php | 2 +- htdocs/don/list.php | 2 +- htdocs/don/paiement/list.php | 2 +- htdocs/ecm/dir_add_card.php | 2 +- htdocs/ecm/dir_card.php | 2 +- htdocs/ecm/file_card.php | 2 +- htdocs/ecm/file_note.php | 2 +- htdocs/ecm/index.php | 2 +- htdocs/ecm/index_auto.php | 2 +- htdocs/ecm/index_medias.php | 2 +- htdocs/ecm/search.php | 2 +- htdocs/eventorganization/conferenceorbooth_document.php | 2 +- htdocs/eventorganization/conferenceorbooth_list.php | 2 +- htdocs/eventorganization/conferenceorboothattendee_list.php | 2 +- htdocs/expedition/document.php | 2 +- htdocs/expedition/list.php | 2 +- htdocs/expensereport/document.php | 2 +- htdocs/expensereport/index.php | 4 ++-- htdocs/expensereport/payment/list.php | 2 +- htdocs/fichinter/agenda.php | 2 +- htdocs/fichinter/card-rec.php | 2 +- htdocs/fichinter/document.php | 2 +- htdocs/fichinter/list.php | 2 +- htdocs/fourn/commande/document.php | 2 +- htdocs/fourn/commande/info.php | 2 +- htdocs/fourn/commande/list.php | 2 +- htdocs/fourn/contact.php | 4 ++-- htdocs/fourn/facture/card-rec.php | 2 +- htdocs/fourn/facture/document.php | 2 +- htdocs/fourn/facture/list-rec.php | 2 +- htdocs/fourn/facture/list.php | 2 +- htdocs/fourn/paiement/document.php | 2 +- htdocs/fourn/paiement/list.php | 2 +- htdocs/fourn/product/list.php | 2 +- htdocs/ftp/index.php | 2 +- htdocs/holiday/define_holiday.php | 2 +- htdocs/holiday/document.php | 2 +- htdocs/holiday/list.php | 2 +- htdocs/holiday/view_log.php | 2 +- htdocs/hrm/admin/admin_establishment.php | 2 +- htdocs/hrm/establishment/info.php | 2 +- htdocs/hrm/evaluation_agenda.php | 2 +- htdocs/hrm/evaluation_document.php | 2 +- htdocs/hrm/evaluation_list.php | 2 +- htdocs/hrm/job_agenda.php | 2 +- htdocs/hrm/job_document.php | 2 +- htdocs/hrm/job_list.php | 2 +- htdocs/hrm/position_agenda.php | 2 +- htdocs/hrm/position_document.php | 2 +- htdocs/hrm/position_list.php | 2 +- htdocs/hrm/skill_agenda.php | 2 +- htdocs/hrm/skill_document.php | 2 +- htdocs/hrm/skill_list.php | 2 +- htdocs/intracommreport/list.php | 2 +- htdocs/knowledgemanagement/knowledgerecord_agenda.php | 2 +- htdocs/knowledgemanagement/knowledgerecord_document.php | 2 +- htdocs/knowledgemanagement/knowledgerecord_list.php | 2 +- htdocs/loan/document.php | 2 +- htdocs/loan/list.php | 2 +- htdocs/margin/agentMargins.php | 2 +- htdocs/margin/checkMargins.php | 2 +- htdocs/margin/customerMargins.php | 2 +- htdocs/margin/productMargins.php | 2 +- htdocs/margin/tabs/productMargins.php | 2 +- htdocs/margin/tabs/thirdpartyMargins.php | 2 +- htdocs/mrp/mo_document.php | 2 +- htdocs/mrp/mo_list.php | 2 +- htdocs/mrp/mo_movements.php | 2 +- htdocs/multicurrency/multicurrency_rate.php | 2 +- htdocs/opensurvey/list.php | 2 +- htdocs/partnership/partnership_agenda.php | 2 +- htdocs/partnership/partnership_document.php | 2 +- htdocs/partnership/partnership_list.php | 2 +- htdocs/product/agenda.php | 2 +- htdocs/product/document.php | 2 +- htdocs/product/fournisseurs.php | 2 +- htdocs/product/inventory/list.php | 2 +- htdocs/product/list.php | 2 +- htdocs/product/popuprop.php | 2 +- htdocs/product/price.php | 2 +- htdocs/product/reassort.php | 2 +- htdocs/product/reassortlot.php | 2 +- htdocs/product/stats/bom.php | 2 +- htdocs/product/stats/commande.php | 2 +- htdocs/product/stats/commande_fournisseur.php | 2 +- htdocs/product/stats/contrat.php | 2 +- htdocs/product/stats/facture.php | 2 +- htdocs/product/stats/facture_fournisseur.php | 2 +- htdocs/product/stats/facturerec.php | 2 +- htdocs/product/stats/mo.php | 2 +- htdocs/product/stats/propal.php | 2 +- htdocs/product/stats/supplier_proposal.php | 2 +- htdocs/product/stock/card.php | 2 +- htdocs/product/stock/list.php | 2 +- htdocs/product/stock/massstockmove.php | 2 +- htdocs/product/stock/movement_card.php | 2 +- htdocs/product/stock/movement_list.php | 2 +- htdocs/product/stock/productlot_document.php | 2 +- htdocs/product/stock/productlot_list.php | 2 +- htdocs/product/stock/replenish.php | 2 +- htdocs/product/stock/replenishorders.php | 2 +- htdocs/product/stock/stats/commande_fournisseur.php | 2 +- htdocs/product/stock/stats/expedition.php | 2 +- htdocs/product/stock/stats/mo.php | 2 +- htdocs/product/stock/stats/reception.php | 2 +- htdocs/product/stock/stockatdate.php | 2 +- htdocs/product/stock/stocktransfer/stocktransfer_agenda.php | 2 +- htdocs/product/stock/stocktransfer/stocktransfer_document.php | 2 +- htdocs/product/stock/stocktransfer/stocktransfer_list.php | 2 +- htdocs/product/stock/valo.php | 2 +- htdocs/projet/agenda.php | 2 +- htdocs/projet/list.php | 2 +- htdocs/projet/messaging.php | 2 +- htdocs/projet/tasks.php | 2 +- htdocs/projet/tasks/document.php | 2 +- htdocs/projet/tasks/list.php | 2 +- htdocs/projet/tasks/time.php | 2 +- htdocs/public/members/public_list.php | 2 +- htdocs/public/opensurvey/index.php | 2 +- htdocs/public/recruitment/index.php | 2 +- htdocs/reception/document.php | 2 +- htdocs/reception/list.php | 2 +- htdocs/recruitment/recruitmentcandidature_agenda.php | 2 +- htdocs/recruitment/recruitmentcandidature_document.php | 2 +- htdocs/recruitment/recruitmentcandidature_list.php | 2 +- htdocs/recruitment/recruitmentjobposition_agenda.php | 2 +- htdocs/recruitment/recruitmentjobposition_document.php | 2 +- htdocs/recruitment/recruitmentjobposition_list.php | 2 +- htdocs/resource/agenda.php | 2 +- htdocs/resource/document.php | 2 +- htdocs/salaries/document.php | 2 +- htdocs/salaries/list.php | 2 +- htdocs/salaries/payments.php | 2 +- htdocs/societe/agenda.php | 2 +- htdocs/societe/list.php | 2 +- htdocs/societe/messaging.php | 2 +- htdocs/societe/notify/card.php | 2 +- htdocs/societe/price.php | 2 +- htdocs/societe/societecontact.php | 2 +- htdocs/societe/website.php | 2 +- htdocs/stripe/charge.php | 2 +- htdocs/stripe/payout.php | 2 +- htdocs/stripe/transaction.php | 2 +- htdocs/supplier_proposal/document.php | 2 +- htdocs/supplier_proposal/list.php | 2 +- htdocs/ticket/agenda.php | 2 +- htdocs/ticket/document.php | 2 +- htdocs/ticket/list.php | 2 +- htdocs/ticket/messaging.php | 2 +- htdocs/user/agenda.php | 2 +- htdocs/user/document.php | 2 +- htdocs/user/group/list.php | 2 +- htdocs/user/list.php | 2 +- htdocs/user/messaging.php | 2 +- htdocs/user/notify/card.php | 2 +- htdocs/variants/list.php | 2 +- htdocs/webhook/target_list.php | 2 +- htdocs/website/index.php | 2 +- htdocs/workstation/workstation_agenda.php | 2 +- htdocs/workstation/workstation_document.php | 2 +- htdocs/workstation/workstation_list.php | 2 +- 278 files changed, 281 insertions(+), 281 deletions(-) diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php index 20d561ed752..b95e972374d 100644 --- a/htdocs/accountancy/admin/account.php +++ b/htdocs/accountancy/admin/account.php @@ -50,7 +50,7 @@ $search_accountparent = GETPOST('search_accountparent', 'alpha'); $search_pcgtype = GETPOST('search_pcgtype', 'alpha'); $search_import_key = GETPOST('search_import_key', 'alpha'); $toselect = GETPOST('toselect', 'array'); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $confirm = GETPOST('confirm', 'alpha'); $chartofaccounts = GETPOSTINT('chartofaccounts'); diff --git a/htdocs/accountancy/admin/categories.php b/htdocs/accountancy/admin/categories.php index 465f2836122..37fd2ce3ed1 100644 --- a/htdocs/accountancy/admin/categories.php +++ b/htdocs/accountancy/admin/categories.php @@ -46,7 +46,7 @@ if ($cat_id == 0) { } // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/accountancy/admin/fiscalyear.php b/htdocs/accountancy/admin/fiscalyear.php index d1ba74b8b56..59a89a20bdd 100644 --- a/htdocs/accountancy/admin/fiscalyear.php +++ b/htdocs/accountancy/admin/fiscalyear.php @@ -29,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/fiscalyear.class.php'; $action = GETPOST('action', 'aZ09'); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/accountancy/admin/subaccount.php b/htdocs/accountancy/admin/subaccount.php index 188915b0ec0..dd18283a704 100644 --- a/htdocs/accountancy/admin/subaccount.php +++ b/htdocs/accountancy/admin/subaccount.php @@ -55,7 +55,7 @@ if (!$user->hasRight('accounting', 'chartofaccount')) { } // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php index 58807c5bcd2..3ef0b40b8c1 100644 --- a/htdocs/accountancy/bookkeeping/balance.php +++ b/htdocs/accountancy/bookkeeping/balance.php @@ -64,7 +64,7 @@ if ($search_accountancy_code_end == - 1) { $search_not_reconciled = GETPOST('search_not_reconciled', 'alpha'); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/adherents/agenda.php b/htdocs/adherents/agenda.php index a42090f5b3c..9996fb644b5 100644 --- a/htdocs/adherents/agenda.php +++ b/htdocs/adherents/agenda.php @@ -41,7 +41,7 @@ $langs->loadLangs(array('companies', 'members')); $id = GETPOSTINT('id') ? GETPOSTINT('id') : GETPOSTINT('rowid'); // Pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/adherents/document.php b/htdocs/adherents/document.php index e92e1da0d41..b2e8f943cf4 100644 --- a/htdocs/adherents/document.php +++ b/htdocs/adherents/document.php @@ -44,7 +44,7 @@ $action = GETPOST('action', 'aZ09'); $confirm = GETPOST('confirm', 'alpha'); // Get parameters -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php index e8d85f21c76..16088574096 100644 --- a/htdocs/adherents/list.php +++ b/htdocs/adherents/list.php @@ -102,7 +102,7 @@ if ($search_status < -2) { } // Pagination parameters -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php index 3ace1b42d58..11e817b6587 100644 --- a/htdocs/adherents/subscription.php +++ b/htdocs/adherents/subscription.php @@ -54,7 +54,7 @@ $typeid = GETPOSTINT('typeid'); $cancel = GETPOST('cancel'); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php index 3a99f379502..277a2f67a4f 100644 --- a/htdocs/adherents/subscription/list.php +++ b/htdocs/adherents/subscription/list.php @@ -57,7 +57,7 @@ $search_all = ''; $date_select = GETPOST("date_select", 'alpha'); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php index df36f5c95da..8148f6ca683 100644 --- a/htdocs/adherents/type.php +++ b/htdocs/adherents/type.php @@ -61,7 +61,7 @@ $status = GETPOST('status', 'alpha'); $optioncss = GETPOST('optioncss', 'alpha'); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/admin/const.php b/htdocs/admin/const.php index 317e838e922..1667f5138bb 100644 --- a/htdocs/admin/const.php +++ b/htdocs/admin/const.php @@ -41,7 +41,7 @@ $constname = GETPOST('constname', 'alphanohtml'); $constvalue = GETPOST('constvalue', 'restricthtml'); // We should be able to send everything here $constnote = GETPOST('constnote', 'alpha'); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php index 430befce12b..56dc6b7aa97 100644 --- a/htdocs/admin/defaultvalues.php +++ b/htdocs/admin/defaultvalues.php @@ -46,7 +46,7 @@ $optioncss = GETPOST('optionscss', 'alphanohtml'); $mode = GETPOST('mode', 'aZ09') ? GETPOST('mode', 'aZ09') : 'createform'; // 'createform', 'filters', 'sortorder', 'focus' -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/admin/emailcollector_list.php b/htdocs/admin/emailcollector_list.php index 84706102216..668eb8fe6b2 100644 --- a/htdocs/admin/emailcollector_list.php +++ b/htdocs/admin/emailcollector_list.php @@ -50,7 +50,7 @@ $mode = GETPOST('mode', 'aZ'); $id = GETPOSTINT('id'); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/admin/events.php b/htdocs/admin/events.php index 323483601a1..e701c903c07 100644 --- a/htdocs/admin/events.php +++ b/htdocs/admin/events.php @@ -41,7 +41,7 @@ $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'au $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print') // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/admin/mails_senderprofile_list.php b/htdocs/admin/mails_senderprofile_list.php index bcf786ec1b0..b96f325aaf4 100644 --- a/htdocs/admin/mails_senderprofile_list.php +++ b/htdocs/admin/mails_senderprofile_list.php @@ -48,7 +48,7 @@ $id = GETPOSTINT('id'); $rowid = GETPOST('rowid', 'alpha'); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php index ae1f8bf67d1..1ff0e80dbb4 100644 --- a/htdocs/admin/mails_templates.php +++ b/htdocs/admin/mails_templates.php @@ -81,7 +81,7 @@ $actl[1] = img_picto($langs->trans("Activated"), 'switch_on', 'class="size15x"') $listoffset = GETPOST('listoffset', 'alpha'); $listlimit = GETPOST('listlimit', 'alpha') > 0 ? GETPOST('listlimit', 'alpha') : 1000; -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php index b44581098bc..a913b110fff 100644 --- a/htdocs/admin/tools/dolibarr_export.php +++ b/htdocs/admin/tools/dolibarr_export.php @@ -44,7 +44,7 @@ if (!$sortfield) { if (empty($page) || $page == -1) { $page = 0; } -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $offset = $limit * $page; if (!$user->admin) { diff --git a/htdocs/admin/tools/export.php b/htdocs/admin/tools/export.php index 860cef0e9cd..2f81fd1b1f1 100644 --- a/htdocs/admin/tools/export.php +++ b/htdocs/admin/tools/export.php @@ -38,7 +38,7 @@ $export_type = GETPOST('export_type', 'alpha'); $file = dol_sanitizeFileName(GETPOST('filename_template', 'alpha')); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/admin/tools/export_files.php b/htdocs/admin/tools/export_files.php index 446a013df81..6828c37acbf 100644 --- a/htdocs/admin/tools/export_files.php +++ b/htdocs/admin/tools/export_files.php @@ -59,7 +59,7 @@ if ($page < 0) { } elseif (empty($page)) { $page = 0; } -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $offset = $limit * $page; if (!$user->admin) { diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php index 902239fca39..49a5b4a47e5 100644 --- a/htdocs/admin/tools/listevents.php +++ b/htdocs/admin/tools/listevents.php @@ -47,7 +47,7 @@ if ($user->socid > 0) { $langs->loadLangs(array("companies", "admin", "users", "other","withdrawals")); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/admin/tools/listsessions.php b/htdocs/admin/tools/listsessions.php index 0fdf1a0e561..def0be0975a 100644 --- a/htdocs/admin/tools/listsessions.php +++ b/htdocs/admin/tools/listsessions.php @@ -47,7 +47,7 @@ if ($user->socid > 0) { $socid = $user->socid; } -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php index 307f4e3a579..79d1c3eb87b 100644 --- a/htdocs/admin/translation.php +++ b/htdocs/admin/translation.php @@ -52,7 +52,7 @@ if ($mode == 'searchkey') { } -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/admin/website.php b/htdocs/admin/website.php index b517491d14c..a66ad8b43dd 100644 --- a/htdocs/admin/website.php +++ b/htdocs/admin/website.php @@ -49,7 +49,7 @@ $actl[0] = img_picto($langs->trans("Disabled"), 'switch_off', 'class="size15x"') $actl[1] = img_picto($langs->trans("Activated"), 'switch_on', 'class="size15x"'); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/admin/website_options.php b/htdocs/admin/website_options.php index 8066ac8604d..4e2c85e9697 100644 --- a/htdocs/admin/website_options.php +++ b/htdocs/admin/website_options.php @@ -40,7 +40,7 @@ $confirm = GETPOST('confirm', 'alpha'); $backtopage = GETPOST('backtopage', 'alpha'); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/asset/agenda.php b/htdocs/asset/agenda.php index 56e33e2e317..8f099abc537 100644 --- a/htdocs/asset/agenda.php +++ b/htdocs/asset/agenda.php @@ -51,7 +51,7 @@ if (GETPOST('actioncode', 'array')) { $search_rowid = GETPOST('search_rowid'); $search_agenda_label = GETPOST('search_agenda_label'); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST("sortfield", 'alpha'); $sortorder = GETPOST("sortorder", 'alpha'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/asset/document.php b/htdocs/asset/document.php index bf585199df1..3c8a71d9425 100644 --- a/htdocs/asset/document.php +++ b/htdocs/asset/document.php @@ -41,7 +41,7 @@ $id = GETPOSTINT('id'); $ref = GETPOST('ref', 'alpha'); // Get parameters -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST("sortfield", 'alpha'); $sortorder = GETPOST("sortorder", 'alpha'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/asset/list.php b/htdocs/asset/list.php index c35fe380279..561c16881b0 100644 --- a/htdocs/asset/list.php +++ b/htdocs/asset/list.php @@ -47,7 +47,7 @@ $mode = GETPOST('mode', 'alpha'); // mode view (kanban or common) $id = GETPOSTINT('id'); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/asset/model/agenda.php b/htdocs/asset/model/agenda.php index 1eb0a2e850a..797c1036af1 100644 --- a/htdocs/asset/model/agenda.php +++ b/htdocs/asset/model/agenda.php @@ -51,7 +51,7 @@ if (GETPOST('actioncode', 'array')) { //$search_rowid = GETPOST('search_rowid'); //$search_agenda_label = GETPOST('search_agenda_label'); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST("sortfield", 'alpha'); $sortorder = GETPOST("sortorder", 'alpha'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/asset/model/list.php b/htdocs/asset/model/list.php index cb61803017c..5c151668e9c 100644 --- a/htdocs/asset/model/list.php +++ b/htdocs/asset/model/list.php @@ -45,7 +45,7 @@ $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always ' $id = GETPOSTINT('id'); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/blockedlog/admin/blockedlog_list.php b/htdocs/blockedlog/admin/blockedlog_list.php index bb385e34984..016fae147a1 100644 --- a/htdocs/blockedlog/admin/blockedlog_list.php +++ b/htdocs/blockedlog/admin/blockedlog_list.php @@ -80,7 +80,7 @@ if (($search_start == -1 || empty($search_start)) && !GETPOSTISSET('search_start } // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/bom/bom_agenda.php b/htdocs/bom/bom_agenda.php index f6229b309a1..b4f5a8531b7 100644 --- a/htdocs/bom/bom_agenda.php +++ b/htdocs/bom/bom_agenda.php @@ -56,7 +56,7 @@ $search_rowid = GETPOST('search_rowid'); $search_agenda_label = GETPOST('search_agenda_label'); // Load variables for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/bom/bom_document.php b/htdocs/bom/bom_document.php index 458d9d0b1aa..fae9d759bda 100644 --- a/htdocs/bom/bom_document.php +++ b/htdocs/bom/bom_document.php @@ -46,7 +46,7 @@ $ref = GETPOST('ref', 'alpha'); // $result = restrictedArea($user, 'bom', $id); // Load variables for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/bom/bom_list.php b/htdocs/bom/bom_list.php index a3d335c11da..e9f32ee0433 100644 --- a/htdocs/bom/bom_list.php +++ b/htdocs/bom/bom_list.php @@ -48,7 +48,7 @@ $mode = GETPOST('mode', 'aZ'); // mode view (kanban or common) // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT('page'); diff --git a/htdocs/bookcal/availabilities_agenda.php b/htdocs/bookcal/availabilities_agenda.php index 5c29e0c45cc..21f6b113231 100644 --- a/htdocs/bookcal/availabilities_agenda.php +++ b/htdocs/bookcal/availabilities_agenda.php @@ -54,7 +54,7 @@ if (GETPOST('actioncode', 'array')) { $search_rowid = GETPOST('search_rowid'); $search_agenda_label = GETPOST('search_agenda_label'); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/bookcal/availabilities_document.php b/htdocs/bookcal/availabilities_document.php index 433d92b144f..6991cd5ed6c 100644 --- a/htdocs/bookcal/availabilities_document.php +++ b/htdocs/bookcal/availabilities_document.php @@ -41,7 +41,7 @@ $id = (GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id')); $ref = GETPOST('ref', 'alpha'); // Get parameters -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/bookcal/availabilities_list.php b/htdocs/bookcal/availabilities_list.php index 16efbe2d5df..3559e285947 100644 --- a/htdocs/bookcal/availabilities_list.php +++ b/htdocs/bookcal/availabilities_list.php @@ -52,7 +52,7 @@ $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always ' $mode = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hierarchy', 'calendar', ...) // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/bookcal/calendar_agenda.php b/htdocs/bookcal/calendar_agenda.php index 7ef31ec2c3e..e7712a1f8b1 100644 --- a/htdocs/bookcal/calendar_agenda.php +++ b/htdocs/bookcal/calendar_agenda.php @@ -54,7 +54,7 @@ if (GETPOST('actioncode', 'array')) { $search_rowid = GETPOST('search_rowid'); $search_agenda_label = GETPOST('search_agenda_label'); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/bookcal/calendar_document.php b/htdocs/bookcal/calendar_document.php index 32aaf416f35..38538b2f8a8 100644 --- a/htdocs/bookcal/calendar_document.php +++ b/htdocs/bookcal/calendar_document.php @@ -43,7 +43,7 @@ $id = (GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id')); $ref = GETPOST('ref', 'alpha'); // Get parameters -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/bookcal/calendar_list.php b/htdocs/bookcal/calendar_list.php index 7a735b81c86..7787d75ddb8 100644 --- a/htdocs/bookcal/calendar_list.php +++ b/htdocs/bookcal/calendar_list.php @@ -50,7 +50,7 @@ $id = GETPOSTINT('id'); $ref = GETPOST('ref', 'alpha'); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/bookmarks/list.php b/htdocs/bookmarks/list.php index f333df50690..67f4e68088f 100644 --- a/htdocs/bookmarks/list.php +++ b/htdocs/bookmarks/list.php @@ -44,7 +44,7 @@ $id = GETPOSTINT("id"); $search_title = GETPOST('search_title', 'alpha'); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php index a277b9b03c8..d0d954802da 100644 --- a/htdocs/categories/viewcat.php +++ b/htdocs/categories/viewcat.php @@ -54,7 +54,7 @@ $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php index ccda6ff5be1..b98e30d33ca 100644 --- a/htdocs/comm/action/document.php +++ b/htdocs/comm/action/document.php @@ -67,7 +67,7 @@ if ($id > 0) { $hookmanager->initHooks(array('actioncard', 'globalcard')); // Get parameters -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index 78c5449ccca..67ea4fef765 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -74,7 +74,7 @@ $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTI if (empty($page) || $page == -1) { $page = 0; } // If $page is not defined, or '' or -1 -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $offset = $limit * $page; if (!$sortorder) { $sortorder = "ASC"; diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php index 408b64c6fc9..514c9a4171c 100644 --- a/htdocs/comm/action/list.php +++ b/htdocs/comm/action/list.php @@ -115,7 +115,7 @@ if (empty($filtert) && !getDolGlobalString('AGENDA_ALL_CALENDARS')) { } // Pagination parameters -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/comm/action/pertype.php b/htdocs/comm/action/pertype.php index 990c9af705f..a40b63a50ad 100644 --- a/htdocs/comm/action/pertype.php +++ b/htdocs/comm/action/pertype.php @@ -69,7 +69,7 @@ $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTI if (empty($page) || $page == -1) { $page = 0; } // If $page is not defined, or '' or -1 -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $offset = $limit * $page; if (!$sortorder) { $sortorder = "ASC"; diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php index 97098383652..9642d24053c 100644 --- a/htdocs/comm/action/peruser.php +++ b/htdocs/comm/action/peruser.php @@ -69,7 +69,7 @@ $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTI if (empty($page) || $page == -1) { $page = 0; } // If $page is not defined, or '' or -1 -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $offset = $limit * $page; if (!$sortorder) { $sortorder = "ASC"; diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php index 5bf0b91974b..246befa21ef 100644 --- a/htdocs/comm/action/rapport/index.php +++ b/htdocs/comm/action/rapport/index.php @@ -39,7 +39,7 @@ $month = GETPOSTINT('month'); $year = GETPOSTINT('year'); $optioncss = GETPOST('optioncss', 'alpha'); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php index 796f17e710c..36d7de22671 100644 --- a/htdocs/comm/card.php +++ b/htdocs/comm/card.php @@ -94,7 +94,7 @@ $action = GETPOST('action', 'aZ09'); $id = (GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id')); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/comm/contact.php b/htdocs/comm/contact.php index a0eec00fa04..3f0b01ff537 100644 --- a/htdocs/comm/contact.php +++ b/htdocs/comm/contact.php @@ -42,7 +42,7 @@ if (!$sortfield) { if ($page < 0) { $page = 0; } -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $offset = $limit * $page; $type = GETPOST('type', 'alpha'); diff --git a/htdocs/comm/mailing/advtargetemailing.php b/htdocs/comm/mailing/advtargetemailing.php index e0098643747..a64b886a0d4 100644 --- a/htdocs/comm/mailing/advtargetemailing.php +++ b/htdocs/comm/mailing/advtargetemailing.php @@ -44,7 +44,7 @@ if (isModEnabled('category')) { } // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php index 4b36bba8cda..e6644d5bdbd 100644 --- a/htdocs/comm/mailing/cibles.php +++ b/htdocs/comm/mailing/cibles.php @@ -39,7 +39,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php'; $langs->loadLangs(array("mails", "admin")); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/comm/propal/agenda.php b/htdocs/comm/propal/agenda.php index 1fe3cf6d5dd..157c47bfdbd 100644 --- a/htdocs/comm/propal/agenda.php +++ b/htdocs/comm/propal/agenda.php @@ -50,7 +50,7 @@ if (GETPOST('actioncode', 'array')) { $search_rowid = GETPOST('search_rowid'); $search_agenda_label = GETPOST('search_agenda_label'); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php index e0dbd6b45b1..1d81859f0cf 100644 --- a/htdocs/comm/propal/document.php +++ b/htdocs/comm/propal/document.php @@ -46,7 +46,7 @@ $id = GETPOSTINT('id'); $ref = GETPOST('ref', 'alpha'); // Get parameters -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php index 911d866b671..81fd59eb56b 100644 --- a/htdocs/comm/propal/list.php +++ b/htdocs/comm/propal/list.php @@ -147,7 +147,7 @@ $search_status = GETPOST('search_status', 'alpha'); $optioncss = GETPOST('optioncss', 'alpha'); // Pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/commande/agenda.php b/htdocs/commande/agenda.php index af2a5da5594..3096e93831c 100644 --- a/htdocs/commande/agenda.php +++ b/htdocs/commande/agenda.php @@ -50,7 +50,7 @@ if (GETPOST('actioncode', 'array')) { $search_rowid = GETPOST('search_rowid'); $search_agenda_label = GETPOST('search_agenda_label'); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/commande/customer.php b/htdocs/commande/customer.php index 4f826bf3af3..1a9079b6418 100644 --- a/htdocs/commande/customer.php +++ b/htdocs/commande/customer.php @@ -46,7 +46,7 @@ if (!$user->hasRight('facture', 'creer')) { // Load translation files required by the page $langs->loadLangs(array("companies", "orders")); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php index 06ada04a04f..8be9504cf18 100644 --- a/htdocs/commande/document.php +++ b/htdocs/commande/document.php @@ -46,7 +46,7 @@ $id = GETPOSTINT('id'); $ref = GETPOST('ref'); // Get parameters -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index e01cc02b357..1a96c6a7e6b 100644 --- a/htdocs/commande/list.php +++ b/htdocs/commande/list.php @@ -124,7 +124,7 @@ $search_fk_input_reason = GETPOSTINT('search_fk_input_reason'); $diroutputmassaction = $conf->commande->multidir_output[$conf->entity].'/temp/massgeneration/'.$user->id; // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/commande/list_det.php b/htdocs/commande/list_det.php index 2adbd25a7d0..ad037a7c026 100644 --- a/htdocs/commande/list_det.php +++ b/htdocs/commande/list_det.php @@ -132,7 +132,7 @@ $search_fk_input_reason = GETPOSTINT("search_fk_input_reason"); $diroutputmassaction = $conf->commande->multidir_output[$conf->entity].'/temp/massgeneration/'.$user->id; // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/compta/accounting-files.php b/htdocs/compta/accounting-files.php index 05351d41713..05bb11ed23a 100644 --- a/htdocs/compta/accounting-files.php +++ b/htdocs/compta/accounting-files.php @@ -78,7 +78,7 @@ $projectid = (GETPOSTINT('projectid') ? GETPOSTINT('projectid') : 0); $hookmanager->initHooks(array('comptafileslist', 'globallist')); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/compta/bank/account_statement_document.php b/htdocs/compta/bank/account_statement_document.php index 9585ac55973..32c6b1c9e01 100644 --- a/htdocs/compta/bank/account_statement_document.php +++ b/htdocs/compta/bank/account_statement_document.php @@ -51,7 +51,7 @@ if ($user->socid) { } // Get parameters -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php index 82184b9ecb7..81d4d0e3738 100644 --- a/htdocs/compta/bank/bankentries_list.php +++ b/htdocs/compta/bank/bankentries_list.php @@ -96,7 +96,7 @@ if (empty($dateop)) { $dateop = -1; } -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/compta/bank/document.php b/htdocs/compta/bank/document.php index 006d8e72a4f..7df02b4b4f1 100644 --- a/htdocs/compta/bank/document.php +++ b/htdocs/compta/bank/document.php @@ -51,7 +51,7 @@ if ($user->socid) { } // Get parameters -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php index 480c36cd07e..4cfb917017e 100644 --- a/htdocs/compta/bank/list.php +++ b/htdocs/compta/bank/list.php @@ -73,7 +73,7 @@ if ($user->socid) { $diroutputmassaction = $conf->bank->dir_output.'/temp/massgeneration/'.$user->id; -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php index 34c61ad8b31..2c215f3a0ab 100644 --- a/htdocs/compta/bank/releve.php +++ b/htdocs/compta/bank/releve.php @@ -76,7 +76,7 @@ if ($user->hasRight('banque', 'consolidate') && $action == 'dvprev' && !empty($d } -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/compta/bank/various_payment/document.php b/htdocs/compta/bank/various_payment/document.php index 7c717d7ede0..30b02e86f8b 100644 --- a/htdocs/compta/bank/various_payment/document.php +++ b/htdocs/compta/bank/various_payment/document.php @@ -47,7 +47,7 @@ if ($user->socid) { $result = restrictedArea($user, 'banque', '', '', ''); // Get parameters -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/compta/bank/various_payment/list.php b/htdocs/compta/bank/various_payment/list.php index 8a2aa9178f7..50203a3a815 100644 --- a/htdocs/compta/bank/various_payment/list.php +++ b/htdocs/compta/bank/various_payment/list.php @@ -42,7 +42,7 @@ $mode = GETPOST('mode', 'alpha'); $massaction = GETPOST('massaction', 'aZ09'); $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'directdebitcredittransferlist'; // To manage different context of search -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $search_ref = GETPOST('search_ref', 'alpha'); $search_user = GETPOST('search_user', 'alpha'); $search_label = GETPOST('search_label', 'alpha'); diff --git a/htdocs/compta/cashcontrol/cashcontrol_card.php b/htdocs/compta/cashcontrol/cashcontrol_card.php index 74cce92938d..db39a879308 100644 --- a/htdocs/compta/cashcontrol/cashcontrol_card.php +++ b/htdocs/compta/cashcontrol/cashcontrol_card.php @@ -47,7 +47,7 @@ $syear = (GETPOSTISSET('closeyear') ? GETPOSTINT('closeyear') : dol_print_date($ $smonth = (GETPOSTISSET('closemonth') ? GETPOSTINT('closemonth') : dol_print_date($now, "%m")); $sday = (GETPOSTISSET('closeday') ? GETPOSTINT('closeday') : dol_print_date($now, "%d")); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/compta/cashcontrol/cashcontrol_list.php b/htdocs/compta/cashcontrol/cashcontrol_list.php index c3cd5cd37a1..18e23efa53f 100644 --- a/htdocs/compta/cashcontrol/cashcontrol_list.php +++ b/htdocs/compta/cashcontrol/cashcontrol_list.php @@ -45,7 +45,7 @@ $mode = GETPOST('mode', 'alpha'); // for mode view result $id = GETPOSTINT('id'); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php index 534b4a45d01..680c90f8d04 100644 --- a/htdocs/compta/charges/index.php +++ b/htdocs/compta/charges/index.php @@ -63,7 +63,7 @@ $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' $search_account = GETPOSTINT('search_account'); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/compta/clients.php b/htdocs/compta/clients.php index c7963e95090..8b47e9a0aa3 100644 --- a/htdocs/compta/clients.php +++ b/htdocs/compta/clients.php @@ -45,7 +45,7 @@ $langs->load("companies"); $mode = GETPOST("mode"); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/compta/deplacement/document.php b/htdocs/compta/deplacement/document.php index d950e51d852..9d77c73ff34 100644 --- a/htdocs/compta/deplacement/document.php +++ b/htdocs/compta/deplacement/document.php @@ -45,7 +45,7 @@ $confirm = GETPOST('confirm', 'alpha'); // Get parameters -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/compta/deplacement/index.php b/htdocs/compta/deplacement/index.php index 4adeb8913d6..2711ee5970c 100644 --- a/htdocs/compta/deplacement/index.php +++ b/htdocs/compta/deplacement/index.php @@ -38,7 +38,7 @@ if ($user->socid) { } $result = restrictedArea($user, 'deplacement', '', ''); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); @@ -54,7 +54,7 @@ if (!$sortorder) { if (!$sortfield) { $sortfield = "d.dated"; } -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); /* diff --git a/htdocs/compta/deplacement/list.php b/htdocs/compta/deplacement/list.php index c3eac0cb087..172c7175d53 100644 --- a/htdocs/compta/deplacement/list.php +++ b/htdocs/compta/deplacement/list.php @@ -49,7 +49,7 @@ $search_company = GETPOST('search_company', 'alpha'); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); if (empty($page) || $page == -1) { $page = 0; } // If $page is not defined, or '' or -1 diff --git a/htdocs/compta/facture/agenda-rec.php b/htdocs/compta/facture/agenda-rec.php index 3636c91fce7..4a0c945b723 100644 --- a/htdocs/compta/facture/agenda-rec.php +++ b/htdocs/compta/facture/agenda-rec.php @@ -51,7 +51,7 @@ if (GETPOST('actioncode', 'array')) { $search_rowid = GETPOST('search_rowid'); $search_agenda_label = GETPOST('search_agenda_label'); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/compta/facture/agenda.php b/htdocs/compta/facture/agenda.php index 2880e158273..c986254a715 100644 --- a/htdocs/compta/facture/agenda.php +++ b/htdocs/compta/facture/agenda.php @@ -50,7 +50,7 @@ if (GETPOST('actioncode', 'array')) { $search_rowid = GETPOST('search_rowid'); $search_agenda_label = GETPOST('search_agenda_label'); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/compta/facture/card-rec.php b/htdocs/compta/facture/card-rec.php index 3502f31d822..efe77c128a9 100644 --- a/htdocs/compta/facture/card-rec.php +++ b/htdocs/compta/facture/card-rec.php @@ -73,7 +73,7 @@ $year_date_when = GETPOST('year_date_when'); $month_date_when = GETPOST('month_date_when'); $selectedLines = GETPOST('toselect', 'array'); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php index 47c6faf0c76..abc869cf031 100644 --- a/htdocs/compta/facture/document.php +++ b/htdocs/compta/facture/document.php @@ -50,7 +50,7 @@ $action = GETPOST('action', 'aZ09'); $confirm = GETPOST('confirm', 'alpha'); // Get parameters -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/compta/facture/invoicetemplate_list.php b/htdocs/compta/facture/invoicetemplate_list.php index 13a119e35b5..cb67dc4bbe2 100644 --- a/htdocs/compta/facture/invoicetemplate_list.php +++ b/htdocs/compta/facture/invoicetemplate_list.php @@ -97,7 +97,7 @@ $search_unit_frequency = GETPOST('search_unit_frequency', 'alpha'); $search_nb_gen_done = GETPOST('search_nb_gen_done', 'alpha'); $search_status = GETPOST('search_status', 'intcomma'); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php index 13995e6cc0b..7abf07206a6 100644 --- a/htdocs/compta/facture/list.php +++ b/htdocs/compta/facture/list.php @@ -152,7 +152,7 @@ if ($search_late == 'late') { $search_status = '1'; } -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index f7a2026903d..aaad52684f5 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -933,7 +933,7 @@ if (!GETPOST('action', 'aZ09')) { if (empty($page) || $page == -1) { $page = 0; } - $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; + $limit = GETPOSTINT('limit', $conf->liste_limit); $offset = $limit * $page; if (!$sortorder) { diff --git a/htdocs/compta/paiement/cheque/card.php b/htdocs/compta/paiement/cheque/card.php index 9af72aa1a1f..fe74afe765e 100644 --- a/htdocs/compta/paiement/cheque/card.php +++ b/htdocs/compta/paiement/cheque/card.php @@ -61,7 +61,7 @@ if (!$sortfield) { if (empty($page) || $page == -1) { $page = 0; } -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $offset = $limit * $page; $upload_dir = $conf->bank->multidir_output[$object->entity ? $object->entity : $conf->entity]."/checkdeposits"; diff --git a/htdocs/compta/paiement/cheque/list.php b/htdocs/compta/paiement/cheque/list.php index 7243c91f3c3..9d26c07560a 100644 --- a/htdocs/compta/paiement/cheque/list.php +++ b/htdocs/compta/paiement/cheque/list.php @@ -54,7 +54,7 @@ $search_account = GETPOSTINT('search_account'); $search_amount = GETPOST('search_amount', 'alpha'); $mode = GETPOST('mode', 'alpha'); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php index 12c2ec797d8..7cf396f7573 100644 --- a/htdocs/compta/paiement/list.php +++ b/htdocs/compta/paiement/list.php @@ -69,7 +69,7 @@ $search_status = GETPOST('search_status', 'intcomma'); $search_sale = GETPOSTINT('search_sale'); $mode = GETPOST('mode', 'alpha'); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/compta/paiement/tovalidate.php b/htdocs/compta/paiement/tovalidate.php index 7a79d37cc5c..65224c37557 100644 --- a/htdocs/compta/paiement/tovalidate.php +++ b/htdocs/compta/paiement/tovalidate.php @@ -35,7 +35,7 @@ if ($user->socid > 0) { } -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php index c9f2401513b..6c5fb010347 100644 --- a/htdocs/compta/prelevement/card.php +++ b/htdocs/compta/prelevement/card.php @@ -45,7 +45,7 @@ $type = GETPOST('type', 'aZ09'); $date_trans = dol_mktime(GETPOSTINT('date_transhour'), GETPOSTINT('date_transmin'), GETPOSTINT('date_transsec'), GETPOSTINT('date_transmonth'), GETPOSTINT('date_transday'), GETPOSTINT('date_transyear')); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php index a6b326ac456..71b138cc0a6 100644 --- a/htdocs/compta/prelevement/create.php +++ b/htdocs/compta/prelevement/create.php @@ -55,7 +55,7 @@ $format = GETPOST('format', 'aZ09'); $id_bankaccount = GETPOSTINT('id_bankaccount'); $executiondate = dol_mktime(0, 0, 0, GETPOSTINT('remonth'), GETPOSTINT('reday'), GETPOSTINT('reyear')); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); if (empty($page) || $page == -1) { $page = 0; diff --git a/htdocs/compta/prelevement/demandes.php b/htdocs/compta/prelevement/demandes.php index 0829b4cc8ec..7a96f2a55ee 100644 --- a/htdocs/compta/prelevement/demandes.php +++ b/htdocs/compta/prelevement/demandes.php @@ -51,7 +51,7 @@ $search_facture = GETPOST('search_facture', 'alpha'); $search_societe = GETPOST('search_societe', 'alpha'); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php index 1fe40efa05e..dba7583f807 100644 --- a/htdocs/compta/prelevement/factures.php +++ b/htdocs/compta/prelevement/factures.php @@ -45,7 +45,7 @@ $userid = GETPOSTINT('userid'); $type = GETPOST('type', 'aZ09'); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php index febb51cdc1d..38f11895988 100644 --- a/htdocs/compta/prelevement/fiche-rejet.php +++ b/htdocs/compta/prelevement/fiche-rejet.php @@ -51,7 +51,7 @@ $ref = GETPOST('ref', 'alpha'); $type = GETPOST('type', 'aZ09'); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/compta/prelevement/fiche-stat.php b/htdocs/compta/prelevement/fiche-stat.php index b0fadbafd1b..272afb1db8c 100644 --- a/htdocs/compta/prelevement/fiche-stat.php +++ b/htdocs/compta/prelevement/fiche-stat.php @@ -41,7 +41,7 @@ $ref = GETPOST('ref', 'alpha'); $type = GETPOST('type', 'aZ09'); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/compta/prelevement/line.php b/htdocs/compta/prelevement/line.php index 96d9a2d6b2c..9d8f837c49c 100644 --- a/htdocs/compta/prelevement/line.php +++ b/htdocs/compta/prelevement/line.php @@ -43,7 +43,7 @@ $socid = GETPOSTINT('socid'); $type = GETPOST('type', 'aZ09'); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortorder = GETPOST('sortorder', 'aZ09comma'); $sortfield = GETPOST('sortfield', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/compta/prelevement/list.php b/htdocs/compta/prelevement/list.php index c21f88d2157..2d36e8841e5 100644 --- a/htdocs/compta/prelevement/list.php +++ b/htdocs/compta/prelevement/list.php @@ -48,7 +48,7 @@ $mode = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hier $type = GETPOST('type', 'aZ09'); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/compta/prelevement/orders_list.php b/htdocs/compta/prelevement/orders_list.php index b6dd673f37f..e6cd1d4de5b 100644 --- a/htdocs/compta/prelevement/orders_list.php +++ b/htdocs/compta/prelevement/orders_list.php @@ -45,7 +45,7 @@ $mode = GETPOST('mode', 'alpha'); $type = GETPOST('type', 'aZ09'); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/compta/prelevement/rejets.php b/htdocs/compta/prelevement/rejets.php index 88d1f736422..11a0d643178 100644 --- a/htdocs/compta/prelevement/rejets.php +++ b/htdocs/compta/prelevement/rejets.php @@ -40,7 +40,7 @@ $langs->loadLangs(array('banks', 'categories', 'withdrawals', 'companies')); $type = GETPOST('type', 'aZ09'); // Get supervariables -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortorder = GETPOST('sortorder', 'aZ09comma'); $sortfield = GETPOST('sortfield', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/compta/recap-compta.php b/htdocs/compta/recap-compta.php index bff81de3bda..80c5329621a 100644 --- a/htdocs/compta/recap-compta.php +++ b/htdocs/compta/recap-compta.php @@ -52,7 +52,7 @@ if ($id > 0) { $hookmanager->initHooks(array('recapcomptacard', 'globalcard')); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php index c300817bfa4..bc3561828b3 100644 --- a/htdocs/compta/resultat/clientfourn.php +++ b/htdocs/compta/resultat/clientfourn.php @@ -54,7 +54,7 @@ $date_endday = GETPOSTINT('date_endday'); $date_endyear = GETPOSTINT('date_endyear'); $showaccountdetail = GETPOST('showaccountdetail', 'aZ09') ? GETPOST('showaccountdetail', 'aZ09') : 'yes'; -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/compta/sociales/document.php b/htdocs/compta/sociales/document.php index 0666335cc4d..2c62883915e 100644 --- a/htdocs/compta/sociales/document.php +++ b/htdocs/compta/sociales/document.php @@ -47,7 +47,7 @@ $action = GETPOST('action', 'aZ09'); $confirm = GETPOST('confirm', 'alpha'); // Get parameters -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/compta/sociales/list.php b/htdocs/compta/sociales/list.php index 5f07abd308a..b63b09d7f0a 100644 --- a/htdocs/compta/sociales/list.php +++ b/htdocs/compta/sociales/list.php @@ -75,7 +75,7 @@ $search_users = GETPOST('search_users'); $search_type = GETPOSTINT('search_type'); $search_account = GETPOSTINT('search_account'); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST("sortorder", 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/compta/sociales/payments.php b/htdocs/compta/sociales/payments.php index b97882242e3..fe1bc5a7d6b 100644 --- a/htdocs/compta/sociales/payments.php +++ b/htdocs/compta/sociales/payments.php @@ -54,7 +54,7 @@ $year = GETPOSTINT("year"); $search_sc_type = GETPOSTINT('search_sc_type'); $optioncss = GETPOST('optioncss', 'alpha'); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/compta/tva/document.php b/htdocs/compta/tva/document.php index b9cf49d5dff..d4b41aa5249 100644 --- a/htdocs/compta/tva/document.php +++ b/htdocs/compta/tva/document.php @@ -48,7 +48,7 @@ $action = GETPOST('action', 'aZ09'); $confirm = GETPOST('confirm', 'alpha'); // Get parameters -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/compta/tva/list.php b/htdocs/compta/tva/list.php index 573c3d50289..fede497b7a8 100644 --- a/htdocs/compta/tva/list.php +++ b/htdocs/compta/tva/list.php @@ -62,7 +62,7 @@ $search_account = GETPOSTINT('search_account'); $search_amount = GETPOST('search_amount', 'alpha'); $search_status = GETPOST('search_status', 'intcomma'); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT('page'); diff --git a/htdocs/compta/tva/payments.php b/htdocs/compta/tva/payments.php index fbcb057a859..c9a9668ae38 100644 --- a/htdocs/compta/tva/payments.php +++ b/htdocs/compta/tva/payments.php @@ -47,7 +47,7 @@ if (!$year && $mode != 'tvaonly') { $year = date("Y", time()); } -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/contact/agenda.php b/htdocs/contact/agenda.php index af06f40761f..7188c6eb668 100644 --- a/htdocs/contact/agenda.php +++ b/htdocs/contact/agenda.php @@ -92,7 +92,7 @@ if ($user->socid) { } $result = restrictedArea($user, 'contact', $id, 'socpeople&societe', '', '', 'rowid', 0); // If we create a contact with no company (shared contacts), no check on write permission -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/contact/consumption.php b/htdocs/contact/consumption.php index 66067b00e6e..203a8aaf028 100644 --- a/htdocs/contact/consumption.php +++ b/htdocs/contact/consumption.php @@ -49,7 +49,7 @@ if (empty($object->thirdparty)) { $socid = !empty($object->thirdparty->id) ? $object->thirdparty->id : null; // Sort & Order fields -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/contact/document.php b/htdocs/contact/document.php index 1a98fb921fa..00617077be4 100644 --- a/htdocs/contact/document.php +++ b/htdocs/contact/document.php @@ -53,7 +53,7 @@ if (!empty($canvas)) { } // Get parameters -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php index d391b2e8d4b..cca4a38cf05 100644 --- a/htdocs/contact/list.php +++ b/htdocs/contact/list.php @@ -135,7 +135,7 @@ $userid = GETPOSTINT('userid'); $begin = GETPOST('begin'); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/contrat/agenda.php b/htdocs/contrat/agenda.php index 848f1a088d7..7647e8d2679 100644 --- a/htdocs/contrat/agenda.php +++ b/htdocs/contrat/agenda.php @@ -63,7 +63,7 @@ $fieldvalue = (!empty($id) ? $id : (!empty($ref) ? $ref : '')); $fieldtype = (!empty($id) ? 'rowid' : 'ref'); $result = restrictedArea($user, 'contrat', $fieldvalue, '', '', '', $fieldtype); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/contrat/document.php b/htdocs/contrat/document.php index 6f19a21fa69..099b7bb90d3 100644 --- a/htdocs/contrat/document.php +++ b/htdocs/contrat/document.php @@ -53,7 +53,7 @@ if ($user->socid > 0) { } // Get parameters -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php index a9c49bbeaab..7d1f21a7926 100644 --- a/htdocs/contrat/list.php +++ b/htdocs/contrat/list.php @@ -108,7 +108,7 @@ $search_date_modif_endday = GETPOSTINT('search_date_modif_endday'); $search_date_modif_end = dol_mktime(23, 59, 59, $search_date_modif_endmonth, $search_date_modif_endday, $search_date_modif_endyear); // Use tzserver // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/contrat/messaging.php b/htdocs/contrat/messaging.php index 8f3e5fac95e..8816149370c 100644 --- a/htdocs/contrat/messaging.php +++ b/htdocs/contrat/messaging.php @@ -56,7 +56,7 @@ $confirm = GETPOST('confirm', 'alpha'); $id = GETPOSTINT('id'); $ref = GETPOST('ref', 'alpha'); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/contrat/services_list.php b/htdocs/contrat/services_list.php index a2542669485..e92610d95b2 100644 --- a/htdocs/contrat/services_list.php +++ b/htdocs/contrat/services_list.php @@ -44,7 +44,7 @@ $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always ' $mode = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hierarchy', 'calendar', ...) // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/core/ajax/ajaxdirpreview.php b/htdocs/core/ajax/ajaxdirpreview.php index 3fbd13840c2..b25028383a3 100644 --- a/htdocs/core/ajax/ajaxdirpreview.php +++ b/htdocs/core/ajax/ajaxdirpreview.php @@ -53,7 +53,7 @@ if (!isset($mode) || $mode != 'noajax') { // For ajax call $urlsource = GETPOST("urlsource", 'alpha'); $search_doc_ref = GETPOST('search_doc_ref', 'alpha'); - $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; + $limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST("sortfield", 'aZ09comma'); $sortorder = GETPOST("sortorder", 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/core/customreports.php b/htdocs/core/customreports.php index 02b795734af..325d31660c5 100644 --- a/htdocs/core/customreports.php +++ b/htdocs/core/customreports.php @@ -55,7 +55,7 @@ if (!defined('USE_CUSTOM_REPORT_AS_INCLUDE')) { $search_graph = GETPOST('search_graph', 'restricthtml'); // Load variable for pagination - $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; + $limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/core/modules/movement/doc/pdf_standard.modules.php b/htdocs/core/modules/movement/doc/pdf_standard.modules.php index e6d6645d8b2..0c85045a527 100644 --- a/htdocs/core/modules/movement/doc/pdf_standard.modules.php +++ b/htdocs/core/modules/movement/doc/pdf_standard.modules.php @@ -178,7 +178,7 @@ class pdf_standard extends ModelePDFMovement $search_qty = trim(GETPOST("search_qty")); $search_type_mouvement = GETPOSTINT('search_type_mouvement'); - $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; + $limit = GETPOSTINT('limit', $conf->liste_limit); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php index 4e14d503f1e..0d3aa74ef87 100644 --- a/htdocs/cron/list.php +++ b/htdocs/cron/list.php @@ -43,7 +43,7 @@ $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'cr $id = GETPOSTINT('id'); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/don/document.php b/htdocs/don/document.php index 4176ac74d7a..882c08c35e1 100644 --- a/htdocs/don/document.php +++ b/htdocs/don/document.php @@ -50,7 +50,7 @@ $confirm = GETPOST('confirm', 'alpha'); $projectid = (GETPOST('projectid') ? GETPOSTINT('projectid') : 0); // Get parameters -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/don/list.php b/htdocs/don/list.php index 13ffaf15511..780982f3c7b 100644 --- a/htdocs/don/list.php +++ b/htdocs/don/list.php @@ -39,7 +39,7 @@ $action = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists) $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'sclist'; -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/don/paiement/list.php b/htdocs/don/paiement/list.php index b314131ca5b..666f3b8983b 100644 --- a/htdocs/don/paiement/list.php +++ b/htdocs/don/paiement/list.php @@ -58,7 +58,7 @@ $search_amount = GETPOST("search_amount", 'alpha'); $search_status = GETPOST('search_status', 'intcomma'); $search_sale = GETPOSTINT('search_sale'); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/ecm/dir_add_card.php b/htdocs/ecm/dir_add_card.php index ad2b5b387c3..b38f9adc5bb 100644 --- a/htdocs/ecm/dir_add_card.php +++ b/htdocs/ecm/dir_add_card.php @@ -67,7 +67,7 @@ if ($module == 'ecm') { $upload_dir = $conf->medias->multidir_output[$conf->entity]; } -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/ecm/dir_card.php b/htdocs/ecm/dir_card.php index 7444815a11e..72d8e592524 100644 --- a/htdocs/ecm/dir_card.php +++ b/htdocs/ecm/dir_card.php @@ -47,7 +47,7 @@ if (empty($module)) { } // Get parameters -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/ecm/file_card.php b/htdocs/ecm/file_card.php index a2551c18932..48e9b0783e8 100644 --- a/htdocs/ecm/file_card.php +++ b/htdocs/ecm/file_card.php @@ -46,7 +46,7 @@ if ($user->socid > 0) { $socid = $user->socid; } -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/ecm/file_note.php b/htdocs/ecm/file_note.php index 580f8ab03dd..ccb3b23a586 100644 --- a/htdocs/ecm/file_note.php +++ b/htdocs/ecm/file_note.php @@ -50,7 +50,7 @@ if ($user->socid > 0) { $backtopage = GETPOST('backtopage', 'alpha'); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php index e0c191e8e23..0e2b6e23ad1 100644 --- a/htdocs/ecm/index.php +++ b/htdocs/ecm/index.php @@ -45,7 +45,7 @@ if (!$section) { $section_dir = GETPOST('section_dir', 'alpha'); $overwritefile = GETPOSTINT('overwritefile'); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/ecm/index_auto.php b/htdocs/ecm/index_auto.php index 7a0338a0126..88114234ba9 100644 --- a/htdocs/ecm/index_auto.php +++ b/htdocs/ecm/index_auto.php @@ -47,7 +47,7 @@ $section_dir = GETPOST('section_dir', 'alpha'); $search_doc_ref = GETPOST('search_doc_ref', 'alpha'); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/ecm/index_medias.php b/htdocs/ecm/index_medias.php index c59cab0c059..771a07d4fd6 100644 --- a/htdocs/ecm/index_medias.php +++ b/htdocs/ecm/index_medias.php @@ -54,7 +54,7 @@ if (empty($action) && $file_manager) { } $pageid = GETPOSTINT('pageid'); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/ecm/search.php b/htdocs/ecm/search.php index 202ea14afb7..a9c4e766170 100644 --- a/htdocs/ecm/search.php +++ b/htdocs/ecm/search.php @@ -59,7 +59,7 @@ if (empty($module)) { $upload_dir = $conf->ecm->dir_output.'/'.$section; -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/eventorganization/conferenceorbooth_document.php b/htdocs/eventorganization/conferenceorbooth_document.php index da8471988d9..3d42c4da2a6 100644 --- a/htdocs/eventorganization/conferenceorbooth_document.php +++ b/htdocs/eventorganization/conferenceorbooth_document.php @@ -53,7 +53,7 @@ $ref = GETPOST('ref', 'alpha'); $withproject = GETPOSTINT('withproject'); $project_ref = GETPOST('project_ref', 'alpha'); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/eventorganization/conferenceorbooth_list.php b/htdocs/eventorganization/conferenceorbooth_list.php index b340622595f..a8c390bdc46 100644 --- a/htdocs/eventorganization/conferenceorbooth_list.php +++ b/htdocs/eventorganization/conferenceorbooth_list.php @@ -58,7 +58,7 @@ $projectid = GETPOSTINT('projectid'); $projectref = GETPOST('ref', 'alpha'); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/eventorganization/conferenceorboothattendee_list.php b/htdocs/eventorganization/conferenceorboothattendee_list.php index 93ae78eeeb2..38f8bfabfa7 100644 --- a/htdocs/eventorganization/conferenceorboothattendee_list.php +++ b/htdocs/eventorganization/conferenceorboothattendee_list.php @@ -66,7 +66,7 @@ $projectid = $fk_project; $withProjectUrl = ''; // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/expedition/document.php b/htdocs/expedition/document.php index d34d4b0a72d..98e99a9e935 100644 --- a/htdocs/expedition/document.php +++ b/htdocs/expedition/document.php @@ -47,7 +47,7 @@ $id = GETPOSTINT('id'); $ref = GETPOST('ref'); // Get parameters -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php index a71b364cdac..597ae8a3e2d 100644 --- a/htdocs/expedition/list.php +++ b/htdocs/expedition/list.php @@ -73,7 +73,7 @@ $search_sale = GETPOSTINT('search_sale'); $search_categ_cus = GETPOSTINT("search_categ_cus"); $search_product_category = GETPOSTINT('search_product_category'); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/expensereport/document.php b/htdocs/expensereport/document.php index c28c5251dc1..272a930ae51 100644 --- a/htdocs/expensereport/document.php +++ b/htdocs/expensereport/document.php @@ -46,7 +46,7 @@ $confirm = GETPOST('confirm', 'alpha'); $childids = $user->getAllChildIds(1); // Get parameters -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/expensereport/index.php b/htdocs/expensereport/index.php index 016fbfee019..0a38650a94b 100644 --- a/htdocs/expensereport/index.php +++ b/htdocs/expensereport/index.php @@ -48,7 +48,7 @@ if ($user->socid) { } $result = restrictedArea($user, 'expensereport', '', ''); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); @@ -64,7 +64,7 @@ if (!$sortorder) { if (!$sortfield) { $sortfield = "d.date_create"; } -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); /* diff --git a/htdocs/expensereport/payment/list.php b/htdocs/expensereport/payment/list.php index c1f474af0db..f17ad86e3b8 100644 --- a/htdocs/expensereport/payment/list.php +++ b/htdocs/expensereport/payment/list.php @@ -73,7 +73,7 @@ $search_cheque_num = GETPOST('search_cheque_num', 'alpha'); $search_bank_account = GETPOSTINT('search_bank_account'); $search_amount = GETPOST('search_amount', 'alpha'); // alpha because we must be able to search on '< x' -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT('page'); diff --git a/htdocs/fichinter/agenda.php b/htdocs/fichinter/agenda.php index e348b888d55..4818eab1e30 100644 --- a/htdocs/fichinter/agenda.php +++ b/htdocs/fichinter/agenda.php @@ -51,7 +51,7 @@ if (GETPOST('actioncode', 'array')) { $search_rowid = GETPOST('search_rowid'); $search_agenda_label = GETPOST('search_agenda_label'); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/fichinter/card-rec.php b/htdocs/fichinter/card-rec.php index 4c71562da9b..1e96ac2dbf0 100644 --- a/htdocs/fichinter/card-rec.php +++ b/htdocs/fichinter/card-rec.php @@ -70,7 +70,7 @@ if ($action == "create" || $action == "add") { $result = restrictedArea($user, 'ficheinter', $id, $objecttype); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/fichinter/document.php b/htdocs/fichinter/document.php index 5ec97fd1908..a0e1de536bb 100644 --- a/htdocs/fichinter/document.php +++ b/htdocs/fichinter/document.php @@ -55,7 +55,7 @@ $result = restrictedArea($user, 'ficheinter', $id, 'fichinter'); // Get parameters -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php index 20878a34e16..2c7ed215649 100644 --- a/htdocs/fichinter/list.php +++ b/htdocs/fichinter/list.php @@ -82,7 +82,7 @@ $socid = GETPOSTINT('socid'); $diroutputmassaction = $conf->ficheinter->dir_output.'/temp/massgeneration/'.$user->id; // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/fourn/commande/document.php b/htdocs/fourn/commande/document.php index 56320809feb..2fda338005f 100644 --- a/htdocs/fourn/commande/document.php +++ b/htdocs/fourn/commande/document.php @@ -48,7 +48,7 @@ $action = GETPOST('action', 'aZ09'); $confirm = GETPOST('confirm', 'alpha'); // Get parameters -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/fourn/commande/info.php b/htdocs/fourn/commande/info.php index 2f80fe4ba45..836adf8d82a 100644 --- a/htdocs/fourn/commande/info.php +++ b/htdocs/fourn/commande/info.php @@ -43,7 +43,7 @@ $id = GETPOSTINT('id'); $ref = GETPOST('ref', 'alpha'); $action = GETPOST('action', 'aZ09'); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTINT("page"); diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php index 1bab50ecddd..209f12ca1bc 100644 --- a/htdocs/fourn/commande/list.php +++ b/htdocs/fourn/commande/list.php @@ -134,7 +134,7 @@ if (GETPOSTISARRAY('search_status')) { $diroutputmassaction = $conf->fournisseur->commande->dir_output.'/temp/massgeneration/'.$user->id; -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/fourn/contact.php b/htdocs/fourn/contact.php index 0be5b7bb135..20427747739 100644 --- a/htdocs/fourn/contact.php +++ b/htdocs/fourn/contact.php @@ -41,7 +41,7 @@ if ($user->socid > 0) { $socid = $user->socid; } -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); @@ -57,7 +57,7 @@ if (!$sortorder) { if (!$sortfield) { $sortfield = "p.name"; } -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); /* diff --git a/htdocs/fourn/facture/card-rec.php b/htdocs/fourn/facture/card-rec.php index a5dc3d0eba1..dd6a607e309 100644 --- a/htdocs/fourn/facture/card-rec.php +++ b/htdocs/fourn/facture/card-rec.php @@ -55,7 +55,7 @@ $cancel = GETPOST('cancel', 'alpha'); $toselect = GETPOST('toselect', 'array'); $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'supplierinvoicetemplatelist'; // To manage different context of search -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST("sortfield", 'alpha'); $sortorder = GETPOST("sortorder", 'alpha'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php index ea6fe3335d0..f192143b784 100644 --- a/htdocs/fourn/facture/document.php +++ b/htdocs/fourn/facture/document.php @@ -55,7 +55,7 @@ $result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture'); $hookmanager->initHooks(array('invoicesuppliercarddocument')); // Get parameters -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/fourn/facture/list-rec.php b/htdocs/fourn/facture/list-rec.php index 62531e8a569..3739dec898d 100644 --- a/htdocs/fourn/facture/list-rec.php +++ b/htdocs/fourn/facture/list-rec.php @@ -96,7 +96,7 @@ $search_unit_frequency = GETPOST('search_unit_frequency', 'alpha'); $search_nb_gen_done = GETPOST('search_nb_gen_done', 'alpha'); $search_status = GETPOST('search_status', 'intcomma'); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php index 642b4612358..7182aa7e6aa 100644 --- a/htdocs/fourn/facture/list.php +++ b/htdocs/fourn/facture/list.php @@ -113,7 +113,7 @@ if ($option == 'late') { $filter = GETPOST('filtre', 'alpha'); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/fourn/paiement/document.php b/htdocs/fourn/paiement/document.php index db152d3eb47..b7819d25c65 100644 --- a/htdocs/fourn/paiement/document.php +++ b/htdocs/fourn/paiement/document.php @@ -60,7 +60,7 @@ if ($user->socid) { $result = restrictedArea($user, $object->element, $object->id, 'paiementfourn', ''); // Get parameters -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/fourn/paiement/list.php b/htdocs/fourn/paiement/list.php index aa328d13024..5ff2340f5c4 100644 --- a/htdocs/fourn/paiement/list.php +++ b/htdocs/fourn/paiement/list.php @@ -68,7 +68,7 @@ $search_bank_account = GETPOSTINT('search_bank_account'); $search_amount = GETPOST('search_amount', 'alpha'); // alpha because we must be able to search on '< x' $search_sale = GETPOSTINT('search_sale'); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT('page'); diff --git a/htdocs/fourn/product/list.php b/htdocs/fourn/product/list.php index 5549f799ddd..a8e48814757 100644 --- a/htdocs/fourn/product/list.php +++ b/htdocs/fourn/product/list.php @@ -46,7 +46,7 @@ $type = GETPOST('type', 'alphanohtml'); $optioncss = GETPOST('optioncss', 'alpha'); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/ftp/index.php b/htdocs/ftp/index.php index 0d3bf9a9496..f48bade81d3 100644 --- a/htdocs/ftp/index.php +++ b/htdocs/ftp/index.php @@ -54,7 +54,7 @@ $confirm = GETPOST('confirm'); $upload_dir = $conf->ftp->dir_temp; $download_dir = $conf->ftp->dir_temp; -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php index 4b8c0974eef..cae68a15387 100644 --- a/htdocs/holiday/define_holiday.php +++ b/htdocs/holiday/define_holiday.php @@ -45,7 +45,7 @@ $search_name = GETPOST('search_name', 'alpha'); $search_supervisor = GETPOSTINT('search_supervisor'); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $toselect = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list diff --git a/htdocs/holiday/document.php b/htdocs/holiday/document.php index 43fe279c57d..d192e12a0d9 100644 --- a/htdocs/holiday/document.php +++ b/htdocs/holiday/document.php @@ -46,7 +46,7 @@ $action = GETPOST('action', 'aZ09'); $confirm = GETPOST('confirm', 'alpha'); // Get parameters -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php index a4eaae03a85..69dd8dca0e5 100644 --- a/htdocs/holiday/list.php +++ b/htdocs/holiday/list.php @@ -66,7 +66,7 @@ $diroutputmassaction = $conf->holiday->dir_output.'/temp/massgeneration/'.$user- // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/holiday/view_log.php b/htdocs/holiday/view_log.php index ac042253777..d2779c6afbd 100644 --- a/htdocs/holiday/view_log.php +++ b/htdocs/holiday/view_log.php @@ -60,7 +60,7 @@ $search_prev_solde = GETPOST('search_prev_solde', 'alphanohtml'); $search_new_solde = GETPOST('search_new_solde', 'alphanohtml'); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/hrm/admin/admin_establishment.php b/htdocs/hrm/admin/admin_establishment.php index 5dacecd2c3c..5172bbdbb64 100644 --- a/htdocs/hrm/admin/admin_establishment.php +++ b/htdocs/hrm/admin/admin_establishment.php @@ -60,7 +60,7 @@ if (empty($page) || $page == -1) { $page = 0; } -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $offset = $limit * $page; $pageprev = $page - 1; $pagenext = $page + 1; diff --git a/htdocs/hrm/establishment/info.php b/htdocs/hrm/establishment/info.php index 2d9ebbd1968..f0782602f3a 100644 --- a/htdocs/hrm/establishment/info.php +++ b/htdocs/hrm/establishment/info.php @@ -46,7 +46,7 @@ if (GETPOST('actioncode', 'array')) { } $search_agenda_label = GETPOST('search_agenda_label'); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/hrm/evaluation_agenda.php b/htdocs/hrm/evaluation_agenda.php index 4507ba5764f..20878b3baa5 100644 --- a/htdocs/hrm/evaluation_agenda.php +++ b/htdocs/hrm/evaluation_agenda.php @@ -58,7 +58,7 @@ if (GETPOST('actioncode', 'array')) { $search_rowid = GETPOST('search_rowid'); $search_agenda_label = GETPOST('search_agenda_label'); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/hrm/evaluation_document.php b/htdocs/hrm/evaluation_document.php index a83905abff9..98c2d76abc6 100644 --- a/htdocs/hrm/evaluation_document.php +++ b/htdocs/hrm/evaluation_document.php @@ -47,7 +47,7 @@ $id = (GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id')); $ref = GETPOST('ref', 'alpha'); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/hrm/evaluation_list.php b/htdocs/hrm/evaluation_list.php index 20b8ee4359c..9183e9ebb7c 100644 --- a/htdocs/hrm/evaluation_list.php +++ b/htdocs/hrm/evaluation_list.php @@ -58,7 +58,7 @@ $id = GETPOSTINT('id'); $ref = GETPOST('ref', 'alpha'); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/hrm/job_agenda.php b/htdocs/hrm/job_agenda.php index 6fffa6934e4..bcd660e1e3e 100644 --- a/htdocs/hrm/job_agenda.php +++ b/htdocs/hrm/job_agenda.php @@ -56,7 +56,7 @@ if (GETPOST('actioncode', 'array')) { $search_rowid = GETPOST('search_rowid'); $search_agenda_label = GETPOST('search_agenda_label'); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/hrm/job_document.php b/htdocs/hrm/job_document.php index 2155f033088..93caa6ea5f1 100644 --- a/htdocs/hrm/job_document.php +++ b/htdocs/hrm/job_document.php @@ -45,7 +45,7 @@ $id = (GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id')); $ref = GETPOST('ref', 'alpha'); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/hrm/job_list.php b/htdocs/hrm/job_list.php index 9191162e979..61746b905bb 100644 --- a/htdocs/hrm/job_list.php +++ b/htdocs/hrm/job_list.php @@ -57,7 +57,7 @@ $mode = GETPOST('mode', 'alpha'); // for view result with other mode $id = GETPOSTINT('id'); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/hrm/position_agenda.php b/htdocs/hrm/position_agenda.php index 49f269d8efa..8fb7658592c 100644 --- a/htdocs/hrm/position_agenda.php +++ b/htdocs/hrm/position_agenda.php @@ -58,7 +58,7 @@ if (GETPOST('actioncode', 'array')) { $search_rowid = GETPOST('search_rowid'); $search_agenda_label = GETPOST('search_agenda_label'); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/hrm/position_document.php b/htdocs/hrm/position_document.php index 539a8405f4a..49b0b0f377c 100644 --- a/htdocs/hrm/position_document.php +++ b/htdocs/hrm/position_document.php @@ -46,7 +46,7 @@ $id = (GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id')); $ref = GETPOST('ref', 'alpha'); // Get parameters for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/hrm/position_list.php b/htdocs/hrm/position_list.php index 4b9666e4c79..db440929e61 100644 --- a/htdocs/hrm/position_list.php +++ b/htdocs/hrm/position_list.php @@ -57,7 +57,7 @@ $id = GETPOSTINT('id'); $ref = GETPOST('ref', 'alpha'); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/hrm/skill_agenda.php b/htdocs/hrm/skill_agenda.php index a469ded4cf9..87dd58e6d17 100644 --- a/htdocs/hrm/skill_agenda.php +++ b/htdocs/hrm/skill_agenda.php @@ -58,7 +58,7 @@ $search_rowid = GETPOST('search_rowid'); $search_agenda_label = GETPOST('search_agenda_label'); // Get Parameters for Pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/hrm/skill_document.php b/htdocs/hrm/skill_document.php index 418208e0465..dcf776c785c 100644 --- a/htdocs/hrm/skill_document.php +++ b/htdocs/hrm/skill_document.php @@ -46,7 +46,7 @@ $id = (GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id')); $ref = GETPOST('ref', 'alpha'); // Get Parameters for Pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/hrm/skill_list.php b/htdocs/hrm/skill_list.php index ea155ac684f..33da365b16a 100644 --- a/htdocs/hrm/skill_list.php +++ b/htdocs/hrm/skill_list.php @@ -58,7 +58,7 @@ $mode = GETPOST('mode', 'alpha'); // for mode view result $id = GETPOSTINT('id'); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/intracommreport/list.php b/htdocs/intracommreport/list.php index 3611ae2c51e..7fa4b76f300 100644 --- a/htdocs/intracommreport/list.php +++ b/htdocs/intracommreport/list.php @@ -46,7 +46,7 @@ $type = GETPOSTINT("type"); $diroutputmassaction = $conf->product->dir_output.'/temp/massgeneration/'.$user->id; -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/knowledgemanagement/knowledgerecord_agenda.php b/htdocs/knowledgemanagement/knowledgerecord_agenda.php index 4ed3b95b63b..dfaa6017361 100644 --- a/htdocs/knowledgemanagement/knowledgerecord_agenda.php +++ b/htdocs/knowledgemanagement/knowledgerecord_agenda.php @@ -54,7 +54,7 @@ if (GETPOST('actioncode', 'array')) { $search_rowid = GETPOST('search_rowid'); $search_agenda_label = GETPOST('search_agenda_label'); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/knowledgemanagement/knowledgerecord_document.php b/htdocs/knowledgemanagement/knowledgerecord_document.php index fa4d8f75ed7..6c8e8f79d60 100644 --- a/htdocs/knowledgemanagement/knowledgerecord_document.php +++ b/htdocs/knowledgemanagement/knowledgerecord_document.php @@ -42,7 +42,7 @@ $id = (GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id')); $ref = GETPOST('ref', 'alpha'); // Get parameters -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/knowledgemanagement/knowledgerecord_list.php b/htdocs/knowledgemanagement/knowledgerecord_list.php index f2ee512c004..6aef8a1fab0 100644 --- a/htdocs/knowledgemanagement/knowledgerecord_list.php +++ b/htdocs/knowledgemanagement/knowledgerecord_list.php @@ -57,7 +57,7 @@ if (GETPOSTISSET('formfilteraction')) { $searchCategoryKnowledgemanagementOperator = getDolGlobalString('MAIN_SEARCH_CAT_OR_BY_DEFAULT'); } // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/loan/document.php b/htdocs/loan/document.php index 74b96bf0877..7552629c216 100644 --- a/htdocs/loan/document.php +++ b/htdocs/loan/document.php @@ -48,7 +48,7 @@ if ($user->socid) { $result = restrictedArea($user, 'loan', $id, '', ''); // Get parameters -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/loan/list.php b/htdocs/loan/list.php index 013c41e3cce..313c33aed3a 100644 --- a/htdocs/loan/list.php +++ b/htdocs/loan/list.php @@ -43,7 +43,7 @@ $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print') $mode = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hierarchy', 'calendar', ...) -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php index bd47dd65d95..37bb3631adb 100644 --- a/htdocs/margin/agentMargins.php +++ b/htdocs/margin/agentMargins.php @@ -36,7 +36,7 @@ $langs->loadLangs(array('companies', 'bills', 'products', 'margins')); $mesg = ''; // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/margin/checkMargins.php b/htdocs/margin/checkMargins.php index 5cdee16619b..5ff62d28783 100644 --- a/htdocs/margin/checkMargins.php +++ b/htdocs/margin/checkMargins.php @@ -40,7 +40,7 @@ $backtopage = GETPOST('backtopage', 'alpha'); $optioncss = GETPOST('optioncss', 'alpha'); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php index b81567d7b09..cae41a5a0b0 100644 --- a/htdocs/margin/customerMargins.php +++ b/htdocs/margin/customerMargins.php @@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/margin/lib/margins.lib.php'; $langs->loadLangs(array('companies', 'bills', 'products', 'margins')); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php index e6837605980..87997aac856 100644 --- a/htdocs/margin/productMargins.php +++ b/htdocs/margin/productMargins.php @@ -43,7 +43,7 @@ $socid = 0; $mesg = ''; // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/margin/tabs/productMargins.php b/htdocs/margin/tabs/productMargins.php index a921bebd8c2..e0476034c86 100644 --- a/htdocs/margin/tabs/productMargins.php +++ b/htdocs/margin/tabs/productMargins.php @@ -43,7 +43,7 @@ if (!empty($user->socid)) { $object = new Product($db); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/margin/tabs/thirdpartyMargins.php b/htdocs/margin/tabs/thirdpartyMargins.php index 83b646baf29..aeea537069f 100644 --- a/htdocs/margin/tabs/thirdpartyMargins.php +++ b/htdocs/margin/tabs/thirdpartyMargins.php @@ -35,7 +35,7 @@ if (!empty($user->socid)) { $socid = $user->socid; } -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/mrp/mo_document.php b/htdocs/mrp/mo_document.php index 6afe0f35686..c374a60caf6 100644 --- a/htdocs/mrp/mo_document.php +++ b/htdocs/mrp/mo_document.php @@ -44,7 +44,7 @@ $id = (GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id')); $ref = GETPOST('ref', 'alpha'); // Get parameters -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/mrp/mo_list.php b/htdocs/mrp/mo_list.php index c88168ed1b9..5e2f38d27ea 100644 --- a/htdocs/mrp/mo_list.php +++ b/htdocs/mrp/mo_list.php @@ -53,7 +53,7 @@ $mode = GETPOST('mode', 'alpha'); $id = GETPOSTINT('id'); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/mrp/mo_movements.php b/htdocs/mrp/mo_movements.php index bab5f6aa68f..3abc698c73d 100644 --- a/htdocs/mrp/mo_movements.php +++ b/htdocs/mrp/mo_movements.php @@ -67,7 +67,7 @@ $search_batch = trim(GETPOST("search_batch", 'alpha')); $search_qty = trim(GETPOST("search_qty", 'alpha')); $search_type_mouvement = GETPOSTINT('search_type_mouvement'); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page"); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); diff --git a/htdocs/multicurrency/multicurrency_rate.php b/htdocs/multicurrency/multicurrency_rate.php index 836b3de06de..63ee37732df 100644 --- a/htdocs/multicurrency/multicurrency_rate.php +++ b/htdocs/multicurrency/multicurrency_rate.php @@ -60,7 +60,7 @@ $dateinput = dol_mktime(0, 0, 0, GETPOSTINT('dateinputmonth'), GETPOSTINT('da $rateinput = (float) price2num(GETPOST('rateinput', 'alpha')); $rateindirectinput = (float) price2num(GETPOST('rateinidirectinput', 'alpha')); $optioncss = GETPOST('optioncss', 'alpha'); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = (GETPOSTINT("page") ? GETPOSTINT("page") : 0); diff --git a/htdocs/opensurvey/list.php b/htdocs/opensurvey/list.php index e1cb682ea33..d6f482bcfb4 100644 --- a/htdocs/opensurvey/list.php +++ b/htdocs/opensurvey/list.php @@ -48,7 +48,7 @@ $search_title = GETPOST('search_title', 'alpha'); $search_status = GETPOST('search_status', 'alpha'); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/partnership/partnership_agenda.php b/htdocs/partnership/partnership_agenda.php index 851809edb21..45d408ad992 100644 --- a/htdocs/partnership/partnership_agenda.php +++ b/htdocs/partnership/partnership_agenda.php @@ -54,7 +54,7 @@ if (GETPOST('actioncode', 'array')) { $search_rowid = GETPOST('search_rowid'); $search_agenda_label = GETPOST('search_agenda_label'); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/partnership/partnership_document.php b/htdocs/partnership/partnership_document.php index 3b9e46c9639..efba17da602 100644 --- a/htdocs/partnership/partnership_document.php +++ b/htdocs/partnership/partnership_document.php @@ -42,7 +42,7 @@ $id = (GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id')); $ref = GETPOST('ref', 'alpha'); // Get parameters -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/partnership/partnership_list.php b/htdocs/partnership/partnership_list.php index 327b8e7988e..0c284bbbabb 100644 --- a/htdocs/partnership/partnership_list.php +++ b/htdocs/partnership/partnership_list.php @@ -55,7 +55,7 @@ $id = GETPOSTINT('id'); $socid = GETPOSTINT('socid'); $memberid = GETPOSTINT('rowid'); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/product/agenda.php b/htdocs/product/agenda.php index 9a11c59abd1..a5ecc5eba25 100644 --- a/htdocs/product/agenda.php +++ b/htdocs/product/agenda.php @@ -56,7 +56,7 @@ if ($user->socid) { $id = $user->socid; } -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/product/document.php b/htdocs/product/document.php index 1435fa74b3a..4a0ded165aa 100644 --- a/htdocs/product/document.php +++ b/htdocs/product/document.php @@ -62,7 +62,7 @@ if ($user->socid) { $hookmanager->initHooks(array('productdocuments')); // Get parameters -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php index f9fcdab2709..43e60b6380e 100644 --- a/htdocs/product/fournisseurs.php +++ b/htdocs/product/fournisseurs.php @@ -81,7 +81,7 @@ if (!$user->hasRight('fournisseur', 'lire') && (!isModEnabled('margin') && !$use accessforbidden(); } -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTINT("page") ? GETPOSTINT("page") : 0; diff --git a/htdocs/product/inventory/list.php b/htdocs/product/inventory/list.php index d9ff6026f0d..3a6dd855543 100644 --- a/htdocs/product/inventory/list.php +++ b/htdocs/product/inventory/list.php @@ -46,7 +46,7 @@ $mode = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hier $id = GETPOSTINT('id'); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/product/list.php b/htdocs/product/list.php index 7d387457b23..3fa6350b70b 100644 --- a/htdocs/product/list.php +++ b/htdocs/product/list.php @@ -118,7 +118,7 @@ if (isModEnabled('variants')) { $diroutputmassaction = $conf->product->dir_output.'/temp/massgeneration/'.$user->id; // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/product/popuprop.php b/htdocs/product/popuprop.php index 0af9c8052ae..afed89383a6 100644 --- a/htdocs/product/popuprop.php +++ b/htdocs/product/popuprop.php @@ -45,7 +45,7 @@ if (!empty($user->socid)) { $socid = $user->socid; } -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/product/price.php b/htdocs/product/price.php index 0ece26ed6d8..744e2070d75 100644 --- a/htdocs/product/price.php +++ b/htdocs/product/price.php @@ -1950,7 +1950,7 @@ if ((!getDolGlobalString('PRODUIT_CUSTOMER_PRICES') || $action == 'showlog_defau if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) { $prodcustprice = new ProductCustomerPrice($db); - $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; + $limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = (GETPOSTINT("page") ? GETPOSTINT("page") : 0); diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php index 32d15a43939..d7e0873640d 100644 --- a/htdocs/product/reassort.php +++ b/htdocs/product/reassort.php @@ -62,7 +62,7 @@ if (!$sortfield) { if (!$sortorder) { $sortorder = "ASC"; } -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); if (empty($page) || $page == -1) { $page = 0; } // If $page is not defined, or '' or -1 diff --git a/htdocs/product/reassortlot.php b/htdocs/product/reassortlot.php index 07873e790ad..d51bc17fd33 100644 --- a/htdocs/product/reassortlot.php +++ b/htdocs/product/reassortlot.php @@ -63,7 +63,7 @@ $sbarcode = GETPOSTINT("sbarcode"); $search_stock_physique = GETPOST('search_stock_physique', 'alpha'); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/product/stats/bom.php b/htdocs/product/stats/bom.php index 73714afa21c..4cf895bc6d1 100644 --- a/htdocs/product/stats/bom.php +++ b/htdocs/product/stats/bom.php @@ -50,7 +50,7 @@ $mesg = ''; $option = ''; // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php index 8c9dbd7830b..e1033a1be70 100644 --- a/htdocs/product/stats/commande.php +++ b/htdocs/product/stats/commande.php @@ -50,7 +50,7 @@ if (!empty($user->socid)) { $hookmanager->initHooks(array('productstatsorder')); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php index e91555cea67..4a77c722232 100644 --- a/htdocs/product/stats/commande_fournisseur.php +++ b/htdocs/product/stats/commande_fournisseur.php @@ -50,7 +50,7 @@ $hookmanager->initHooks(array('productstatssupplierorder')); $mesg = ''; // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php index 6712ac33185..69e5deb5091 100644 --- a/htdocs/product/stats/contrat.php +++ b/htdocs/product/stats/contrat.php @@ -46,7 +46,7 @@ if ($user->socid) { $hookmanager->initHooks(array('productstatscontract')); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php index c44e95eae64..0f5d69c1f54 100644 --- a/htdocs/product/stats/facture.php +++ b/htdocs/product/stats/facture.php @@ -58,7 +58,7 @@ $search_array_options = $extrafields->getOptionalsFromPost('facture', '', 'searc $showmessage = GETPOST('showmessage'); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php index 2ee2e18b793..097854f7d86 100644 --- a/htdocs/product/stats/facture_fournisseur.php +++ b/htdocs/product/stats/facture_fournisseur.php @@ -50,7 +50,7 @@ if (!empty($user->socid)) { $hookmanager->initHooks(array('productstatssupplierinvoice')); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/product/stats/facturerec.php b/htdocs/product/stats/facturerec.php index 83d66963e51..ac925af5d0a 100644 --- a/htdocs/product/stats/facturerec.php +++ b/htdocs/product/stats/facturerec.php @@ -53,7 +53,7 @@ $hookmanager->initHooks(array('productstatsinvoice')); $showmessage = GETPOST('showmessage'); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/product/stats/mo.php b/htdocs/product/stats/mo.php index d98a73fbc79..4ee8efa0a44 100644 --- a/htdocs/product/stats/mo.php +++ b/htdocs/product/stats/mo.php @@ -48,7 +48,7 @@ if ($user->socid) { $hookmanager->initHooks(array('productstatsmo')); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php index 9e6084f78c5..8064f28bc67 100644 --- a/htdocs/product/stats/propal.php +++ b/htdocs/product/stats/propal.php @@ -50,7 +50,7 @@ $result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product $hookmanager->initHooks(array('productstatspropal')); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/product/stats/supplier_proposal.php b/htdocs/product/stats/supplier_proposal.php index 5c755024acd..c284b3cdcae 100644 --- a/htdocs/product/stats/supplier_proposal.php +++ b/htdocs/product/stats/supplier_proposal.php @@ -49,7 +49,7 @@ if (!empty($user->socid)) { $hookmanager->initHooks(array('productstatssupplierpropal')); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php index c812e507035..1e03967e658 100644 --- a/htdocs/product/stock/card.php +++ b/htdocs/product/stock/card.php @@ -58,7 +58,7 @@ $socid = GETPOSTINT('socid'); $ref = GETPOST('ref', 'alpha'); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); if (!$sortfield) { diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php index 787cc14f779..5e2fc05a1ea 100644 --- a/htdocs/product/stock/list.php +++ b/htdocs/product/stock/list.php @@ -60,7 +60,7 @@ if (isModEnabled('category')) { } // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/product/stock/massstockmove.php b/htdocs/product/stock/massstockmove.php index 88b51aa78ab..84f72eba7ab 100644 --- a/htdocs/product/stock/massstockmove.php +++ b/htdocs/product/stock/massstockmove.php @@ -61,7 +61,7 @@ $qty = GETPOST('qty'); $idline = GETPOST('idline'); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/product/stock/movement_card.php b/htdocs/product/stock/movement_card.php index eae9deb3ef0..09471b2a62f 100644 --- a/htdocs/product/stock/movement_card.php +++ b/htdocs/product/stock/movement_card.php @@ -75,7 +75,7 @@ $search_batch = trim(GETPOST("search_batch", 'alpha')); $search_qty = trim(GETPOST("search_qty", 'alpha')); $search_type_mouvement = GETPOSTINT('search_type_mouvement'); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); diff --git a/htdocs/product/stock/movement_list.php b/htdocs/product/stock/movement_list.php index 9a054d18375..593265f9d69 100644 --- a/htdocs/product/stock/movement_list.php +++ b/htdocs/product/stock/movement_list.php @@ -92,7 +92,7 @@ $search_fk_project = GETPOSTINT("search_fk_project"); $type = GETPOSTINT("type"); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/product/stock/productlot_document.php b/htdocs/product/stock/productlot_document.php index 3adc9370df5..73e1409454a 100644 --- a/htdocs/product/stock/productlot_document.php +++ b/htdocs/product/stock/productlot_document.php @@ -60,7 +60,7 @@ $result = restrictedArea($user, 'produit|service'); $hookmanager->initHooks(array('productlotdocuments')); // Get parameters -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php index bd1733bdf81..6d690d79a61 100644 --- a/htdocs/product/stock/productlot_list.php +++ b/htdocs/product/stock/productlot_list.php @@ -53,7 +53,7 @@ $search_fk_user_modif = GETPOSTINT('search_fk_user_modif'); $search_import_key = GETPOSTINT('search_import_key'); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php index 24e9d0d8a10..86e1e56d4e8 100644 --- a/htdocs/product/stock/replenish.php +++ b/htdocs/product/stock/replenish.php @@ -93,7 +93,7 @@ $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTI if (empty($page) || $page == -1) { $page = 0; } // If $page is not defined, or '' or -1 -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $offset = $limit * $page; if (!$sortfield) { diff --git a/htdocs/product/stock/replenishorders.php b/htdocs/product/stock/replenishorders.php index 724eeed763c..4464df16e43 100644 --- a/htdocs/product/stock/replenishorders.php +++ b/htdocs/product/stock/replenishorders.php @@ -53,7 +53,7 @@ $search_dateday = GETPOSTINT('search_dateday'); $search_date = dol_mktime(0, 0, 0, $search_datemonth, $search_dateday, $search_dateyear); $optioncss = GETPOST('optioncss', 'alpha'); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); if (!$sortorder) { diff --git a/htdocs/product/stock/stats/commande_fournisseur.php b/htdocs/product/stock/stats/commande_fournisseur.php index 7f362de5f01..4a29bb0d44c 100644 --- a/htdocs/product/stock/stats/commande_fournisseur.php +++ b/htdocs/product/stock/stats/commande_fournisseur.php @@ -56,7 +56,7 @@ $hookmanager->initHooks(array('batchproductstatssupplierorder')); $showmessage = GETPOST('showmessage'); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/product/stock/stats/expedition.php b/htdocs/product/stock/stats/expedition.php index b3c30f5ce68..a1f617a7564 100644 --- a/htdocs/product/stock/stats/expedition.php +++ b/htdocs/product/stock/stats/expedition.php @@ -56,7 +56,7 @@ $hookmanager->initHooks(array('batchproductstatsexpedition')); $showmessage = GETPOST('showmessage'); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/product/stock/stats/mo.php b/htdocs/product/stock/stats/mo.php index 96699d17d92..e2ddd4be7d7 100644 --- a/htdocs/product/stock/stats/mo.php +++ b/htdocs/product/stock/stats/mo.php @@ -49,7 +49,7 @@ if ($user->socid) { $hookmanager->initHooks(array('batchproductstatsmo')); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/product/stock/stats/reception.php b/htdocs/product/stock/stats/reception.php index ced528e301d..f70b1257b64 100644 --- a/htdocs/product/stock/stats/reception.php +++ b/htdocs/product/stock/stats/reception.php @@ -56,7 +56,7 @@ $hookmanager->initHooks(array('batchproductstatsreception')); $showmessage = GETPOST('showmessage'); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/product/stock/stockatdate.php b/htdocs/product/stock/stockatdate.php index 6b39de66295..38cd13eae64 100644 --- a/htdocs/product/stock/stockatdate.php +++ b/htdocs/product/stock/stockatdate.php @@ -89,7 +89,7 @@ $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTI if (empty($page) || $page == -1) { $page = 0; } // If $page is not defined, or '' or -1 -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $offset = $limit * $page; if (!$sortfield) { $sortfield = 'p.ref'; diff --git a/htdocs/product/stock/stocktransfer/stocktransfer_agenda.php b/htdocs/product/stock/stocktransfer/stocktransfer_agenda.php index 9f328000513..2e8eccf995b 100644 --- a/htdocs/product/stock/stocktransfer/stocktransfer_agenda.php +++ b/htdocs/product/stock/stocktransfer/stocktransfer_agenda.php @@ -52,7 +52,7 @@ if (GETPOST('actioncode', 'array')) { $search_rowid = GETPOST('search_rowid'); $search_agenda_label = GETPOST('search_agenda_label'); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST("sortfield", 'alpha'); $sortorder = GETPOST("sortorder", 'alpha'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/product/stock/stocktransfer/stocktransfer_document.php b/htdocs/product/stock/stocktransfer/stocktransfer_document.php index 7e851677dc1..dc22e5feb22 100644 --- a/htdocs/product/stock/stocktransfer/stocktransfer_document.php +++ b/htdocs/product/stock/stocktransfer/stocktransfer_document.php @@ -41,7 +41,7 @@ $id = (GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id')); $ref = GETPOST('ref', 'alpha'); // Get parameters -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST("sortfield", 'alpha'); $sortorder = GETPOST("sortorder", 'alpha'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/product/stock/stocktransfer/stocktransfer_list.php b/htdocs/product/stock/stocktransfer/stocktransfer_list.php index d798b7556ac..21af23d7c01 100644 --- a/htdocs/product/stock/stocktransfer/stocktransfer_list.php +++ b/htdocs/product/stock/stocktransfer/stocktransfer_list.php @@ -48,7 +48,7 @@ $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always ' $id = GETPOSTINT('id'); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/product/stock/valo.php b/htdocs/product/stock/valo.php index 259f139a177..b61104011c4 100644 --- a/htdocs/product/stock/valo.php +++ b/htdocs/product/stock/valo.php @@ -49,7 +49,7 @@ $page = $_GET["page"]; if ($page < 0) { $page = 0; } -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $offset = $limit * $page; $year = dol_print_date(dol_now('gmt'), "%Y", 'gmt'); diff --git a/htdocs/projet/agenda.php b/htdocs/projet/agenda.php index d06cde2a04b..712591c5ab9 100644 --- a/htdocs/projet/agenda.php +++ b/htdocs/projet/agenda.php @@ -38,7 +38,7 @@ $socid = GETPOSTINT('socid'); $action = GETPOST('action', 'aZ09'); $contextpage = GETPOST('contextpage', 'aZ09'); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST("sortfield", "aZ09comma"); $sortorder = GETPOST("sortorder", 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php index 4e0f40d0127..3e331514cf8 100644 --- a/htdocs/projet/list.php +++ b/htdocs/projet/list.php @@ -75,7 +75,7 @@ if (!$user->hasRight('projet', 'lire')) { $diroutputmassaction = $conf->project->dir_output.'/temp/massgeneration/'.$user->id; -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/projet/messaging.php b/htdocs/projet/messaging.php index ea2ff3e7a89..eca28d7716e 100644 --- a/htdocs/projet/messaging.php +++ b/htdocs/projet/messaging.php @@ -38,7 +38,7 @@ $socid = GETPOSTINT('socid'); $action = GETPOST('action', 'aZ09'); $contextpage = GETPOST('contextpage', 'aZ09'); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST("sortfield", "aZ09comma"); $sortorder = GETPOST("sortorder", 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php index 23aac791656..e7d135dff47 100644 --- a/htdocs/projet/tasks.php +++ b/htdocs/projet/tasks.php @@ -54,7 +54,7 @@ $ref = GETPOST('ref', 'alpha'); $taskref = GETPOST('taskref', 'alpha'); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php index 7507cafa4b3..f2ed23cf8c1 100644 --- a/htdocs/projet/tasks/document.php +++ b/htdocs/projet/tasks/document.php @@ -46,7 +46,7 @@ $withproject = GETPOSTINT('withproject'); $project_ref = GETPOST('project_ref', 'alpha'); // Get parameters -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php index a7a5c47d757..25ad71ae6fb 100644 --- a/htdocs/projet/tasks/list.php +++ b/htdocs/projet/tasks/list.php @@ -124,7 +124,7 @@ if (!$user->hasRight('projet', 'lire')) { $diroutputmassaction = $conf->project->dir_output.'/tasks/temp/massgeneration/'.$user->id; -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php index c48a6f296cc..42feefa9537 100644 --- a/htdocs/projet/tasks/time.php +++ b/htdocs/projet/tasks/time.php @@ -93,7 +93,7 @@ $search_timespent_startmin = GETPOSTINT("search_timespent_duration_startmin"); $search_timespent_endhour = GETPOSTINT("search_timespent_duration_endhour"); $search_timespent_endmin = GETPOSTINT("search_timespent_duration_endmin"); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/public/members/public_list.php b/htdocs/public/members/public_list.php index 1401d22b82a..1ec6c775697 100644 --- a/htdocs/public/members/public_list.php +++ b/htdocs/public/members/public_list.php @@ -86,7 +86,7 @@ function llxFooterVierge() $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); if (empty($page) || $page == -1) { $page = 0; diff --git a/htdocs/public/opensurvey/index.php b/htdocs/public/opensurvey/index.php index 772245f3d51..310d3f46ca4 100644 --- a/htdocs/public/opensurvey/index.php +++ b/htdocs/public/opensurvey/index.php @@ -53,7 +53,7 @@ $backtopage = ''; $suffix = ""; // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/public/recruitment/index.php b/htdocs/public/recruitment/index.php index bcd27f58b18..c10fad87770 100644 --- a/htdocs/public/recruitment/index.php +++ b/htdocs/public/recruitment/index.php @@ -54,7 +54,7 @@ $backtopage = ''; $suffix = ""; // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/reception/document.php b/htdocs/reception/document.php index 36d9a6efb15..06647afbefd 100644 --- a/htdocs/reception/document.php +++ b/htdocs/reception/document.php @@ -49,7 +49,7 @@ $id = GETPOSTINT('id'); $ref = GETPOST('ref'); // Get parameters -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/reception/list.php b/htdocs/reception/list.php index f6242c6ee14..85c7bf13468 100644 --- a/htdocs/reception/list.php +++ b/htdocs/reception/list.php @@ -79,7 +79,7 @@ $search_billed = GETPOSTINT("search_billed"); $search_status = GETPOST('search_status', 'intcomma'); $search_all = GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/recruitment/recruitmentcandidature_agenda.php b/htdocs/recruitment/recruitmentcandidature_agenda.php index a8339a0ca7b..2e4e9b6cb65 100644 --- a/htdocs/recruitment/recruitmentcandidature_agenda.php +++ b/htdocs/recruitment/recruitmentcandidature_agenda.php @@ -54,7 +54,7 @@ if (GETPOST('actioncode', 'array')) { $search_rowid = GETPOST('search_rowid'); $search_agenda_label = GETPOST('search_agenda_label'); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/recruitment/recruitmentcandidature_document.php b/htdocs/recruitment/recruitmentcandidature_document.php index 741e0107a45..71b7faa3320 100644 --- a/htdocs/recruitment/recruitmentcandidature_document.php +++ b/htdocs/recruitment/recruitmentcandidature_document.php @@ -41,7 +41,7 @@ $id = (GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id')); $ref = GETPOST('ref', 'alpha'); // Get parameters -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/recruitment/recruitmentcandidature_list.php b/htdocs/recruitment/recruitmentcandidature_list.php index 56c05ffdb56..090bc1d3319 100644 --- a/htdocs/recruitment/recruitmentcandidature_list.php +++ b/htdocs/recruitment/recruitmentcandidature_list.php @@ -50,7 +50,7 @@ $mode = GETPOST('mode', 'aZ'); $lineid = GETPOSTINT('lineid'); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/recruitment/recruitmentjobposition_agenda.php b/htdocs/recruitment/recruitmentjobposition_agenda.php index 665f26bc75d..dbee1f831d2 100644 --- a/htdocs/recruitment/recruitmentjobposition_agenda.php +++ b/htdocs/recruitment/recruitmentjobposition_agenda.php @@ -53,7 +53,7 @@ if (GETPOST('actioncode', 'array')) { $search_rowid = GETPOST('search_rowid'); $search_agenda_label = GETPOST('search_agenda_label'); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/recruitment/recruitmentjobposition_document.php b/htdocs/recruitment/recruitmentjobposition_document.php index 11e4fe7bb62..f2d7d85f014 100644 --- a/htdocs/recruitment/recruitmentjobposition_document.php +++ b/htdocs/recruitment/recruitmentjobposition_document.php @@ -41,7 +41,7 @@ $id = (GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id')); $ref = GETPOST('ref', 'alpha'); // Get parameters -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/recruitment/recruitmentjobposition_list.php b/htdocs/recruitment/recruitmentjobposition_list.php index bf62f0beb62..fea96969637 100644 --- a/htdocs/recruitment/recruitmentjobposition_list.php +++ b/htdocs/recruitment/recruitmentjobposition_list.php @@ -46,7 +46,7 @@ $mode = GETPOST('mode', 'aZ'); $id = GETPOSTINT('id'); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/resource/agenda.php b/htdocs/resource/agenda.php index 61c17c3a66c..0325ac771db 100644 --- a/htdocs/resource/agenda.php +++ b/htdocs/resource/agenda.php @@ -58,7 +58,7 @@ if (GETPOST('actioncode', 'array')) { $search_rowid = GETPOST('search_rowid'); $search_agenda_label = GETPOST('search_agenda_label'); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/resource/document.php b/htdocs/resource/document.php index 9bf219dfcec..f3e9bd78747 100644 --- a/htdocs/resource/document.php +++ b/htdocs/resource/document.php @@ -52,7 +52,7 @@ $result = restrictedArea($user, 'resource', $id, 'resource'); // Get parameters -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/salaries/document.php b/htdocs/salaries/document.php index 297da859f33..5996e04269e 100644 --- a/htdocs/salaries/document.php +++ b/htdocs/salaries/document.php @@ -54,7 +54,7 @@ $label = GETPOST('label', 'alphanohtml'); $projectid = (GETPOSTINT('projectid') ? GETPOSTINT('projectid') : GETPOSTINT('fk_project')); // Get parameters -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/salaries/list.php b/htdocs/salaries/list.php index 7af81d47d6e..b0ceffba2e1 100644 --- a/htdocs/salaries/list.php +++ b/htdocs/salaries/list.php @@ -48,7 +48,7 @@ $mode = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hier // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/salaries/payments.php b/htdocs/salaries/payments.php index fc659db2e1b..6493e5afbf4 100644 --- a/htdocs/salaries/payments.php +++ b/htdocs/salaries/payments.php @@ -50,7 +50,7 @@ $mode = GETPOST('mode', 'alpha'); // mode view for result // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php index be5ed78293e..8ada8019d41 100644 --- a/htdocs/societe/agenda.php +++ b/htdocs/societe/agenda.php @@ -52,7 +52,7 @@ if (GETPOST('actioncode', 'array')) { $search_rowid = GETPOST('search_rowid'); $search_agenda_label = GETPOST('search_agenda_label'); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php index 1d780599f2d..cff729e2c56 100644 --- a/htdocs/societe/list.php +++ b/htdocs/societe/list.php @@ -152,7 +152,7 @@ $place = GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : '0'; // $place is $diroutputmassaction = $conf->societe->dir_output.'/temp/massgeneration/'.$user->id; // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/societe/messaging.php b/htdocs/societe/messaging.php index b1275bfcdfe..6046c57e4e3 100644 --- a/htdocs/societe/messaging.php +++ b/htdocs/societe/messaging.php @@ -52,7 +52,7 @@ if (GETPOST('actioncode', 'array')) { $search_rowid = GETPOST('search_rowid'); $search_agenda_label = GETPOST('search_agenda_label'); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php index 0e0031e6f9c..e56db09f24d 100644 --- a/htdocs/societe/notify/card.php +++ b/htdocs/societe/notify/card.php @@ -45,7 +45,7 @@ if ($user->socid) { } $result = restrictedArea($user, 'societe', '', ''); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php index 55d0091a80b..a502b62dc97 100644 --- a/htdocs/societe/price.php +++ b/htdocs/societe/price.php @@ -261,7 +261,7 @@ if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) { $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); - $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; + $limit = GETPOSTINT('limit', $conf->liste_limit); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); if (empty($page) || $page == -1) { $page = 0; diff --git a/htdocs/societe/societecontact.php b/htdocs/societe/societecontact.php index 4411b7a1c37..2dc86bde8a7 100644 --- a/htdocs/societe/societecontact.php +++ b/htdocs/societe/societecontact.php @@ -43,7 +43,7 @@ $ref = GETPOST('ref', 'alpha'); $action = GETPOST('action', 'aZ09'); $massaction = GETPOST('massaction', 'alpha'); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/societe/website.php b/htdocs/societe/website.php index 29484d9773d..27c71219ce1 100644 --- a/htdocs/societe/website.php +++ b/htdocs/societe/website.php @@ -54,7 +54,7 @@ $toselect = GETPOST('toselect', 'array'); // Array of ids of elements selected $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print') $mode = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hierarchy', 'calendar', ...) -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/stripe/charge.php b/htdocs/stripe/charge.php index 947fccafdb3..6d11a56bcbe 100644 --- a/htdocs/stripe/charge.php +++ b/htdocs/stripe/charge.php @@ -41,7 +41,7 @@ if ($user->socid) { } //$result = restrictedArea($user, 'salaries', '', '', ''); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $rowid = GETPOST("rowid", 'alpha'); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); diff --git a/htdocs/stripe/payout.php b/htdocs/stripe/payout.php index 0abc7a5063d..bd9c64bf763 100644 --- a/htdocs/stripe/payout.php +++ b/htdocs/stripe/payout.php @@ -41,7 +41,7 @@ if ($user->socid) { } //$result = restrictedArea($user, 'salaries', '', '', ''); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $rowid = GETPOST("rowid", 'alpha'); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); diff --git a/htdocs/stripe/transaction.php b/htdocs/stripe/transaction.php index bdca6980414..f73c584b24c 100644 --- a/htdocs/stripe/transaction.php +++ b/htdocs/stripe/transaction.php @@ -41,7 +41,7 @@ if ($user->socid) { } //$result = restrictedArea($user, 'salaries', '', '', ''); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $rowid = GETPOST("rowid", 'alpha'); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); diff --git a/htdocs/supplier_proposal/document.php b/htdocs/supplier_proposal/document.php index 650d89ffdc5..d24c6ec2836 100644 --- a/htdocs/supplier_proposal/document.php +++ b/htdocs/supplier_proposal/document.php @@ -52,7 +52,7 @@ if (!empty($user->socid)) { $result = restrictedArea($user, 'supplier_proposal', $id); // Get parameters -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php index c34a60b581b..9e5b2591fb2 100644 --- a/htdocs/supplier_proposal/list.php +++ b/htdocs/supplier_proposal/list.php @@ -106,7 +106,7 @@ $sall = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all' $mesg = (GETPOST("msg") ? GETPOST("msg") : GETPOST("mesg")); $optioncss = GETPOST('optioncss', 'alpha'); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/ticket/agenda.php b/htdocs/ticket/agenda.php index 74cb95e87d5..8c5d10fae70 100644 --- a/htdocs/ticket/agenda.php +++ b/htdocs/ticket/agenda.php @@ -49,7 +49,7 @@ $action = GETPOST('action', 'aZ09'); // Store current page url $url_page_current = DOL_URL_ROOT.'/ticket/agenda.php'; -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/ticket/document.php b/htdocs/ticket/document.php index 12ec2a2d953..27d154a84ff 100644 --- a/htdocs/ticket/document.php +++ b/htdocs/ticket/document.php @@ -53,7 +53,7 @@ $confirm = GETPOST('confirm', 'alpha'); $url_page_current = DOL_URL_ROOT.'/ticket/document.php'; // Get parameters -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php index 4ccef134ea0..18709719ee1 100644 --- a/htdocs/ticket/list.php +++ b/htdocs/ticket/list.php @@ -72,7 +72,7 @@ $search_dateclose_end = dol_mktime(23, 59, 59, GETPOSTINT('search_dateclose_endm // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/ticket/messaging.php b/htdocs/ticket/messaging.php index 98fb7551fe1..09943ada8e1 100644 --- a/htdocs/ticket/messaging.php +++ b/htdocs/ticket/messaging.php @@ -49,7 +49,7 @@ $action = GETPOST('action', 'aZ09'); // Store current page url $url_page_current = DOL_URL_ROOT.'/ticket/messaging.php'; -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST("sortfield", "aZ09comma"); $sortorder = GETPOST("sortorder", 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/user/agenda.php b/htdocs/user/agenda.php index 229c299a2e7..a6f4f4d2ac9 100644 --- a/htdocs/user/agenda.php +++ b/htdocs/user/agenda.php @@ -52,7 +52,7 @@ if (GETPOST('actioncode', 'array')) { $search_rowid = GETPOST('search_rowid'); $search_agenda_label = GETPOST('search_agenda_label'); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/user/document.php b/htdocs/user/document.php index 1c1f0895d46..e97be6a29ce 100644 --- a/htdocs/user/document.php +++ b/htdocs/user/document.php @@ -82,7 +82,7 @@ if ($user->id != $id && !$canreaduser) { } // Get parameters -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/user/group/list.php b/htdocs/user/group/list.php index f491bdad587..ffbd73b3fe6 100644 --- a/htdocs/user/group/list.php +++ b/htdocs/user/group/list.php @@ -48,7 +48,7 @@ $search_group = GETPOST('search_group'); $search = array(); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/user/list.php b/htdocs/user/list.php index e55dc5ea1bc..10ea9a10b2f 100644 --- a/htdocs/user/list.php +++ b/htdocs/user/list.php @@ -54,7 +54,7 @@ if ($user->socid > 0) { } // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/user/messaging.php b/htdocs/user/messaging.php index 319a00e9f5e..be82eb01403 100644 --- a/htdocs/user/messaging.php +++ b/htdocs/user/messaging.php @@ -56,7 +56,7 @@ $ref = GETPOST('ref', 'alpha'); $search_rowid = GETPOST('search_rowid'); $search_agenda_label = GETPOST('search_agenda_label'); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/user/notify/card.php b/htdocs/user/notify/card.php index 240723c47c8..292c48b6645 100644 --- a/htdocs/user/notify/card.php +++ b/htdocs/user/notify/card.php @@ -45,7 +45,7 @@ if (!isset($id) || empty($id)) { $action = GETPOST('action', 'aZ09'); $actionid = GETPOSTINT('actionid'); -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/variants/list.php b/htdocs/variants/list.php index 0bee01ba154..71cbbdba5ea 100644 --- a/htdocs/variants/list.php +++ b/htdocs/variants/list.php @@ -44,7 +44,7 @@ $mode = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hier $id = GETPOSTINT('id'); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/webhook/target_list.php b/htdocs/webhook/target_list.php index cbcca8fbfe8..c120213d81c 100644 --- a/htdocs/webhook/target_list.php +++ b/htdocs/webhook/target_list.php @@ -54,7 +54,7 @@ if (empty($mode)) { $id = GETPOSTINT('id'); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/website/index.php b/htdocs/website/index.php index 74c43d54e48..d1e82ffc3e7 100644 --- a/htdocs/website/index.php +++ b/htdocs/website/index.php @@ -143,7 +143,7 @@ if (GETPOST('refreshsite') || GETPOST('refreshsite_x') || GETPOST('refreshsite.x } // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/workstation/workstation_agenda.php b/htdocs/workstation/workstation_agenda.php index 4e6853596bc..a3db02f9841 100644 --- a/htdocs/workstation/workstation_agenda.php +++ b/htdocs/workstation/workstation_agenda.php @@ -56,7 +56,7 @@ $search_rowid = GETPOST('search_rowid'); $search_agenda_label = GETPOST('search_agenda_label'); // Load variables for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/workstation/workstation_document.php b/htdocs/workstation/workstation_document.php index e1b891da1ce..c08bc1fecad 100644 --- a/htdocs/workstation/workstation_document.php +++ b/htdocs/workstation/workstation_document.php @@ -44,7 +44,7 @@ $id = (GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id')); $ref = GETPOST('ref', 'alpha'); // Get parameters -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); diff --git a/htdocs/workstation/workstation_list.php b/htdocs/workstation/workstation_list.php index 2d1e9d9fefc..54d269d561f 100644 --- a/htdocs/workstation/workstation_list.php +++ b/htdocs/workstation/workstation_list.php @@ -51,7 +51,7 @@ $id = GETPOSTINT('id'); $ref = GETPOST('ref', 'alpha'); // Load variable for pagination -$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; +$limit = GETPOSTINT('limit', $conf->liste_limit); $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");