diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php index c98e2f12da7..8618b1049fd 100644 --- a/htdocs/comm/propal/list.php +++ b/htdocs/comm/propal/list.php @@ -141,7 +141,6 @@ $search_date_signature_end = dol_mktime(23, 59, 59, $search_date_signature_endmo $search_status = GETPOST('search_status', 'alpha'); $optioncss = GETPOST('optioncss', 'alpha'); -$object_statut = GETPOST('search_statut', 'alpha'); // Pagination $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; @@ -373,7 +372,6 @@ if (empty($reshook)) { $search_date_delivery_end = ''; $search_availability = ''; $search_status = ''; - $object_statut = ''; $search_categ_cus = 0; $search_fk_cond_reglement = ''; $search_fk_shipping_method = ''; @@ -390,9 +388,6 @@ if (empty($reshook)) { $toselect = array(); $search_array_options = array(); } - if ($object_statut != '') { - $search_status = $object_statut; - } // Mass actions $objectclass = 'Propal'; @@ -1467,7 +1462,7 @@ if ($search_date_signature_endyear) { // Status if (!empty($arrayfields['p.fk_statut']['checked'])) { print ''; - $formpropal->selectProposalStatus($search_status, 1, 0, 1, 'customer', 'search_statut', 'search_status width100 onrightofpage'); + $formpropal->selectProposalStatus($search_status, 1, 0, 1, 'customer', 'search_status', 'search_status width100 onrightofpage'); print ''; } // Action column @@ -1623,7 +1618,7 @@ if ($search_date_signature_endyear) { $totalarray['nbfield']++; } if (!empty($arrayfields['u.login']['checked'])) { - print_liste_field_titre($arrayfields['u.login']['label'], $_SERVER["PHP_SELF"], 'u.login', '', $param, '', $sortfield, $sortorder, 'center '); + print_liste_field_titre($arrayfields['u.login']['label'], $_SERVER["PHP_SELF"], 'u.login', '', $param, '', $sortfield, $sortorder); $totalarray['nbfield']++; } if (!empty($arrayfields['sale_representative']['checked'])) { diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index 2fd664cbb68..408b10ae81c 100644 --- a/htdocs/commande/list.php +++ b/htdocs/commande/list.php @@ -105,8 +105,8 @@ $search_multicurrency_montant_ttc = GETPOST('search_multicurrency_montant_ttc', $search_login = GETPOST('search_login', 'alpha'); $search_categ_cus = GETPOSTINT("search_categ_cus"); $optioncss = GETPOST('optioncss', 'alpha'); -$search_billed = GETPOSTINT('search_billed'); -$search_status = GETPOSTINT('search_status'); +$search_billed = GETPOST('search_billed', 'int'); +$search_status = GETPOST('search_status', 'intcomma'); $search_project_ref = GETPOST('search_project_ref', 'alpha'); $search_project = GETPOST('search_project', 'alpha'); $search_shippable = GETPOST('search_shippable', 'aZ09'); diff --git a/htdocs/commande/list_det.php b/htdocs/commande/list_det.php index 9dcbe3711c1..75237945ea4 100644 --- a/htdocs/commande/list_det.php +++ b/htdocs/commande/list_det.php @@ -119,10 +119,8 @@ $search_multicurrency_montant_ttc = GETPOST('search_multicurrency_montant_ttc', $search_login = GETPOST('search_login', 'alpha'); $search_categ_cus = GETPOSTINT("search_categ_cus"); $optioncss = GETPOST('optioncss', 'alpha'); -$search_billed = GETPOSTISSET('search_billed') ? GETPOSTINT('search_billed') : GETPOSTINT('billed'); -$search_status = GETPOSTINT('search_status'); -$search_btn = GETPOST('button_search', 'alpha'); -$search_remove_btn = GETPOST('button_removefilter', 'alpha'); +$search_billed = GETPOST('search_billed', 'intcomma') ? GETPOST('search_billed', 'intcomma') : GETPOST('billed', 'intcomma'); +$search_status = GETPOST('search_status', 'intcomma'); $search_project_ref = GETPOST('search_project_ref', 'alpha'); $search_project = GETPOST('search_project', 'alpha'); $search_shippable = GETPOST('search_shippable', 'aZ09'); diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php index 05c2ef6de13..ef9206a74ed 100644 --- a/htdocs/compta/bank/list.php +++ b/htdocs/compta/bank/list.php @@ -57,7 +57,7 @@ $mode = GETPOST('mode', 'aZ'); $search_ref = GETPOST('search_ref', 'alpha'); $search_label = GETPOST('search_label', 'alpha'); $search_number = GETPOST('search_number', 'alpha'); -$search_status = GETPOST('search_status') ? GETPOST('search_status', 'alpha') : 'opened'; // 'all' or ''='opened' +$search_status = GETPOST('search_status') ? GETPOST('search_status', 'alpha') : 'opened'; // 'all' or '' means 'opened' $optioncss = GETPOST('optioncss', 'alpha'); $search_category_list =""; diff --git a/htdocs/compta/facture/invoicetemplate_list.php b/htdocs/compta/facture/invoicetemplate_list.php index 540242d2763..d7191fa1590 100644 --- a/htdocs/compta/facture/invoicetemplate_list.php +++ b/htdocs/compta/facture/invoicetemplate_list.php @@ -95,7 +95,7 @@ $search_recurring = GETPOSTINT('search_recurring'); $search_frequency = GETPOST('search_frequency', 'alpha'); $search_unit_frequency = GETPOST('search_unit_frequency', 'alpha'); $search_nb_gen_done = GETPOST('search_nb_gen_done', 'alpha'); -$search_status = GETPOSTINT('search_status'); +$search_status = GETPOST('search_status', 'intcomma'); $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; $sortfield = GETPOST('sortfield', 'aZ09comma'); diff --git a/htdocs/compta/sociales/list.php b/htdocs/compta/sociales/list.php index 900a3453867..5882cc612b8 100644 --- a/htdocs/compta/sociales/list.php +++ b/htdocs/compta/sociales/list.php @@ -53,7 +53,7 @@ $search_ref = GETPOSTINT('search_ref'); $search_label = GETPOST('search_label', 'alpha'); $search_typeid = GETPOSTINT('search_typeid'); $search_amount = GETPOST('search_amount', 'alpha'); -$search_status = GETPOSTINT('search_status'); +$search_status = GETPOST('search_status', 'intcomma'); $search_date_startday = GETPOSTINT('search_date_startday'); $search_date_startmonth = GETPOSTINT('search_date_startmonth'); $search_date_startyear = GETPOSTINT('search_date_startyear'); diff --git a/htdocs/compta/tva/list.php b/htdocs/compta/tva/list.php index 9a36f881ae4..d67ac1d12f3 100644 --- a/htdocs/compta/tva/list.php +++ b/htdocs/compta/tva/list.php @@ -60,8 +60,7 @@ $search_datepayment_end = dol_mktime(23, 59, 59, GETPOSTINT('search_datepayment_ $search_type = GETPOSTINT('search_type'); $search_account = GETPOSTINT('search_account'); $search_amount = GETPOST('search_amount', 'alpha'); -$search_status = GETPOSTINT('search_status'); -$ltt = GETPOSTINT("ltt"); +$search_status = GETPOST('search_status', 'intcomma'); $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; $sortfield = GETPOST('sortfield', 'aZ09comma'); diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql index b17ec92127d..e661fb3db4c 100644 --- a/htdocs/core/menus/init_menu_auguria.sql +++ b/htdocs/core/menus/init_menu_auguria.sql @@ -493,7 +493,7 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("holiday")', __HANDLER__, 'left', 5001__+MAX_llx_menu__, 'hrm', '', 5000__+MAX_llx_menu__, '/holiday/card.php?mainmenu=hrm&action=create', 'New', 1, 'holiday', '$user->hasRight("holiday","write")', '', 0, 1, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("holiday")', __HANDLER__, 'left', 5002__+MAX_llx_menu__, 'hrm', '', 5000__+MAX_llx_menu__, '/holiday/card_group.php?mainmenu=hrm&action=create', 'NewHolidayForGroup', 1, 'holiday', '$user->hasRight("holiday","write")', '', 0, 1, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("holiday")', __HANDLER__, 'left', 5003__+MAX_llx_menu__, 'hrm', '', 5000__+MAX_llx_menu__, '/holiday/list.php?mainmenu=hrm&leftmenu=hrm', 'List', 1, 'holiday', '$user->hasRight("holiday","read")', '', 0, 1, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("holiday")', __HANDLER__, 'left', 5004__+MAX_llx_menu__, 'hrm', '', 5000__+MAX_llx_menu__, '/holiday/list.php?mainmenu=hrm&search_statut=2&leftmenu=hrm', 'ListToApprove', 2, 'trips', '$user->hasRight("holiday","read")', '', 0, 1, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("holiday")', __HANDLER__, 'left', 5004__+MAX_llx_menu__, 'hrm', '', 5000__+MAX_llx_menu__, '/holiday/list.php?mainmenu=hrm&search_status=2&leftmenu=hrm', 'ListToApprove', 2, 'trips', '$user->hasRight("holiday","read")', '', 0, 1, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("holiday")', __HANDLER__, 'left', 5005__+MAX_llx_menu__, 'hrm', '', 5000__+MAX_llx_menu__, '/holiday/define_holiday.php?mainmenu=hrm', 'MenuConfCP', 1, 'holiday', '$user->hasRight("holiday","define_holiday")', '', 0, 2, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("holiday")', __HANDLER__, 'left', 5006__+MAX_llx_menu__, 'hrm', '', 5000__+MAX_llx_menu__, '/holiday/view_log.php?mainmenu=hrm', 'MenuLogCP', 1, 'holiday', '$user->hasRight("holiday","define_holiday")', '', 0, 3, __ENTITY__); diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php index e1010ce2559..8aa30543b4a 100644 --- a/htdocs/cron/list.php +++ b/htdocs/cron/list.php @@ -61,7 +61,7 @@ if (!$sortorder) { $optioncss = GETPOST('optioncss', 'alpha'); $mode = GETPOST('mode', 'aZ09'); //Search criteria -$search_status = (GETPOSTISSET('search_status') ? GETPOSTINT('search_status') : GETPOSTINT('status')); +$search_status = GETPOST('search_status', 'intcomma'); $search_label = GETPOST("search_label", 'alpha'); $search_module_name = GETPOST("search_module_name", 'alpha'); $search_lastresult = GETPOST("search_lastresult", "alphawithlgt"); diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php index ff5ca9fa367..d554bcb4927 100644 --- a/htdocs/fichinter/list.php +++ b/htdocs/fichinter/list.php @@ -655,7 +655,7 @@ if (!empty($arrayfields['fd.description']['checked'])) { print ' '; } if (!empty($arrayfields['fd.date']['checked'])) { - print ''; + print ''; print '
'; print $form->selectDate($search_date_start ?: -1, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From')); print '
'; diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php index f23fc3c07bf..d412fa6d6ee 100644 --- a/htdocs/fourn/commande/list.php +++ b/htdocs/fourn/commande/list.php @@ -109,8 +109,6 @@ $search_country = GETPOSTINT("search_country"); $search_type_thirdparty = GETPOSTINT("search_type_thirdparty"); $search_user = GETPOSTINT('search_user'); $search_request_author = GETPOST('search_request_author', 'alpha'); -$search_ht = GETPOST('search_ht', 'alpha'); -$search_ttc = GETPOST('search_ttc', 'alpha'); $optioncss = GETPOST('optioncss', 'alpha'); $socid = GETPOSTINT('socid'); $search_sale = GETPOSTINT('search_sale'); @@ -123,7 +121,7 @@ $search_multicurrency_montant_ht = GETPOST('search_multicurrency_montant_ht', 'a $search_multicurrency_montant_tva = GETPOST('search_multicurrency_montant_tva', 'alpha'); $search_multicurrency_montant_ttc = GETPOST('search_multicurrency_montant_ttc', 'alpha'); $optioncss = GETPOST('optioncss', 'alpha'); -$search_billed = GETPOSTINT('search_billed'); +$search_billed = GETPOST('search_billed', 'intcomma'); $search_project_ref = GETPOST('search_project_ref', 'alpha'); $search_btn = GETPOST('button_search', 'alpha'); $search_remove_btn = GETPOST('button_removefilter', 'alpha'); diff --git a/htdocs/fourn/facture/list-rec.php b/htdocs/fourn/facture/list-rec.php index ef7bb7bc175..578d58a0117 100644 --- a/htdocs/fourn/facture/list-rec.php +++ b/htdocs/fourn/facture/list-rec.php @@ -94,7 +94,7 @@ $search_recurring = GETPOSTINT('search_recurring'); $search_frequency = GETPOST('search_frequency', 'alpha'); $search_unit_frequency = GETPOST('search_unit_frequency', 'alpha'); $search_nb_gen_done = GETPOST('search_nb_gen_done', 'alpha'); -$search_status = GETPOSTINT('search_status'); +$search_status = GETPOST('search_status', 'intcomma'); $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; $sortfield = GETPOST('sortfield', 'aZ09comma'); diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php index bfdd8fdbdad..3aa79940b91 100644 --- a/htdocs/fourn/facture/list.php +++ b/htdocs/fourn/facture/list.php @@ -83,7 +83,7 @@ $search_multicurrency_tx = GETPOST('search_multicurrency_tx', 'alpha'); $search_multicurrency_montant_ht = GETPOST('search_multicurrency_montant_ht', 'alpha'); $search_multicurrency_montant_vat = GETPOST('search_multicurrency_montant_vat', 'alpha'); $search_multicurrency_montant_ttc = GETPOST('search_multicurrency_montant_ttc', 'alpha'); -$search_status = GETPOSTINT('search_status'); +$search_status = GETPOST('search_status', 'intcomma'); // Can be '' or a numeric $search_paymentmode = GETPOSTINT('search_paymentmode'); $search_paymentcond = GETPOSTINT('search_paymentcond'); $search_town = GETPOST('search_town', 'alpha'); @@ -103,8 +103,6 @@ $search_datelimit_endmonth = GETPOSTINT('search_datelimit_endmonth'); $search_datelimit_endyear = GETPOSTINT('search_datelimit_endyear'); $search_datelimit_start = dol_mktime(0, 0, 0, $search_datelimit_startmonth, $search_datelimit_startday, $search_datelimit_startyear); $search_datelimit_end = dol_mktime(23, 59, 59, $search_datelimit_endmonth, $search_datelimit_endday, $search_datelimit_endyear); -$search_btn = GETPOST('button_search', 'alpha'); -$search_remove_btn = GETPOST('button_removefilter', 'alpha'); $search_categ_sup = trim(GETPOSTINT("search_categ_sup")); $search_product_category = GETPOSTINT('search_product_category'); diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php index fb9f7632250..58a073fcad3 100644 --- a/htdocs/holiday/list.php +++ b/htdocs/holiday/list.php @@ -85,18 +85,18 @@ if (!$sortfield) { $sall = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml')); $search_ref = GETPOST('search_ref', 'alphanohtml'); -$search_day_create = GETPOSTINT('search_day_create'); -$search_month_create = GETPOSTINT('search_month_create'); -$search_year_create = GETPOSTINT('search_year_create'); -$search_day_start = GETPOSTINT('search_day_start'); -$search_month_start = GETPOSTINT('search_month_start'); -$search_year_start = GETPOSTINT('search_year_start'); -$search_day_end = GETPOSTINT('search_day_end'); -$search_month_end = GETPOSTINT('search_month_end'); -$search_year_end = GETPOSTINT('search_year_end'); +$search_day_create = GETPOST('search_day_create', 'int'); +$search_month_create = GETPOST('search_month_create', 'int'); +$search_year_create = GETPOST('search_year_create', 'int'); +$search_day_start = GETPOST('search_day_start', 'int'); +$search_month_start = GETPOST('search_month_start', 'int'); +$search_year_start = GETPOST('search_year_start', 'int'); +$search_day_end = GETPOST('search_day_end', 'int'); +$search_month_end = GETPOST('search_month_end', 'int'); +$search_year_end = GETPOST('search_year_end', 'int'); $search_employee = GETPOSTINT('search_employee'); $search_valideur = GETPOSTINT('search_valideur'); -$search_status = GETPOSTISSET('search_status') ? GETPOSTINT('search_status') : GETPOSTINT('search_statut'); +$search_status = GETPOST('search_status', 'intcomma'); $search_type = GETPOSTINT('search_type'); // Initialize technical objects diff --git a/htdocs/holiday/view_log.php b/htdocs/holiday/view_log.php index 3c0a8154dac..589d1b0d82e 100644 --- a/htdocs/holiday/view_log.php +++ b/htdocs/holiday/view_log.php @@ -246,7 +246,7 @@ if ($limit > 0 && $limit != $conf->liste_limit) { $param .= '&limit='.((int) $limit); } if (!empty($search_id)) { - $param .= '&search_statut='.urlencode($search_statut); + $param .= '&search_status='.urlencode($search_status); } if (!empty($search_month) && $search_month > 0) { $param .= '&search_month='.urlencode($search_month); diff --git a/htdocs/salaries/list.php b/htdocs/salaries/list.php index 0c7dea4f3c9..1102c26fa00 100644 --- a/htdocs/salaries/list.php +++ b/htdocs/salaries/list.php @@ -93,8 +93,8 @@ $search_date_end_from = dol_mktime(0, 0, 0, GETPOSTINT('search_date_end_frommont $search_date_end_to = dol_mktime(23, 59, 59, GETPOSTINT('search_date_end_tomonth'), GETPOSTINT('search_date_end_today'), GETPOSTINT('search_date_end_toyear')); $search_amount = GETPOST('search_amount', 'alpha'); $search_account = GETPOSTINT('search_account'); -$search_status = GETPOSTINT('search_status'); -$search_type_id = GETPOSTINT('search_type_id'); +$search_status = GETPOST('search_status', 'intcomma'); +$search_type_id = GETPOST('search_type_id', 'intcomma'); $filtre = GETPOST("filtre", 'restricthtml'); diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php index eaa09a1b157..b2934afcb1a 100644 --- a/htdocs/supplier_proposal/list.php +++ b/htdocs/supplier_proposal/list.php @@ -94,7 +94,7 @@ $search_multicurrency_tx = GETPOST('search_multicurrency_tx', 'alpha'); $search_multicurrency_montant_ht = GETPOST('search_multicurrency_montant_ht', 'alpha'); $search_multicurrency_montant_vat = GETPOST('search_multicurrency_montant_vat', 'alpha'); $search_multicurrency_montant_ttc = GETPOST('search_multicurrency_montant_ttc', 'alpha'); -$search_status = GETPOSTINT('search_status'); +$search_status = GETPOST('search_status', 'intcomma'); $search_product_category = GETPOSTINT('search_product_category'); $object_statut = $db->escape(GETPOST('supplier_proposal_statut')); diff --git a/htdocs/user/hierarchy.php b/htdocs/user/hierarchy.php index e5861cf00bc..e7a12510b73 100644 --- a/htdocs/user/hierarchy.php +++ b/htdocs/user/hierarchy.php @@ -51,13 +51,13 @@ $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); -$search_statut = GETPOSTINT('search_statut'); -if ($search_statut == '' || $search_statut == '0') { - $search_statut = '1'; +$search_status = GETPOST('search_status', 'intcomma'); +if ($search_status == '' || $search_status == '0') { + $search_status = '1'; } if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // Both test are required to be compatible with all browsers - $search_statut = ""; + $search_status = ""; } if ($contextpage == 'employeelist') { @@ -106,7 +106,7 @@ llxHeader('', $title, $help_url, '', 0, 0, $arrayofjs, $arrayofcss, '', 'bodyfor // Load hierarchy of users -$user_arbo = $userstatic->get_full_tree(0, ($search_statut != '' && $search_statut >= 0) ? "statut = ".$search_statut : ''); +$user_arbo = $userstatic->get_full_tree(0, ($search_status != '' && $search_status >= 0) ? "statut = ".$search_status : ''); // Count total nb of records @@ -169,7 +169,7 @@ if (!is_array($user_arbo) && $user_arbo < 0) { //var_dump($data); - $param = "&search_statut=".urlencode($search_statut); + $param = "&search_status=".urlencode($search_status); $param = "&contextpage=".urlencode($contextpage); $newcardbutton = ''; @@ -212,7 +212,7 @@ if (!is_array($user_arbo) && $user_arbo < 0) { print ' '; // Status print ''; - print $form->selectarray('search_statut', array('-1'=>'', '1'=>$langs->trans('Enabled')), $search_statut, 0, 0, 0, '', 0, 0, 0, '', 'minwidth75imp'); + print $form->selectarray('search_status', array('-1'=>'', '1'=>$langs->trans('Enabled')), $search_status, 0, 0, 0, '', 0, 0, 0, '', 'minwidth75imp'); print ''; // Action column if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) { diff --git a/htdocs/user/list.php b/htdocs/user/list.php index b74db885f69..c7793975b0f 100644 --- a/htdocs/user/list.php +++ b/htdocs/user/list.php @@ -166,7 +166,7 @@ $search_phonepro = GETPOST('search_phonepro', 'alpha'); $search_phonemobile = GETPOST('search_phonemobile', 'alpha'); $search_email = GETPOST('search_email', 'alpha'); $search_api_key = GETPOST('search_api_key', 'alphanohtml'); -$search_statut = GETPOST('search_statut', 'intcomma'); +$search_status = GETPOST('search_status', 'intcomma'); $search_thirdparty = GETPOST('search_thirdparty', 'alpha'); $search_job = GETPOST('search_job', 'alpha'); $search_warehouse = GETPOST('search_warehouse', 'alpha'); @@ -189,8 +189,8 @@ if (!empty($catid) && empty($search_categ)) { } // Default search -if ($search_statut == '') { - $search_statut = '1'; +if ($search_status == '') { + $search_status = '1'; } if ($contextpage == 'employeelist' && !GETPOSTISSET('search_employee')) { $search_employee = 1; @@ -259,7 +259,7 @@ if (empty($reshook)) { $search_phonepro = ""; $search_phonemobile = ""; $search_email = ""; - $search_statut = ""; + $search_status = ""; $search_thirdparty = ""; $search_job = ""; $search_warehouse = ""; @@ -449,8 +449,8 @@ if ($search_api_key != '') { if ($search_job != '') { $sql .= natural_search(array('u.job'), $search_job); } -if ($search_statut != '' && $search_statut >= 0) { - $sql .= " AND u.statut IN (".$db->sanitize($search_statut).")"; +if ($search_status != '' && $search_status >= 0) { + $sql .= " AND u.statut IN (".$db->sanitize($search_status).")"; } if ($search_all) { $sql .= natural_search(array_keys($fieldstosearchall), $search_all); @@ -599,8 +599,8 @@ if ($search_api_key != '') { if ($search_supervisor > 0) { $param .= "&search_supervisor=".urlencode($search_supervisor); } -if ($search_statut != '') { - $param .= "&search_statut=".urlencode($search_statut); +if ($search_status != '') { + $param .= "&search_status=".urlencode($search_status); } if ($optioncss != '') { $param .= '&optioncss='.urlencode($optioncss); @@ -661,9 +661,9 @@ $newcardbutton .= dolGetButtonTitleSeparator(); $newcardbutton .= dolGetButtonTitle($langs->trans('NewUser'), '', 'fa fa-plus-circle', $url, '', $permissiontoadd); /*$moreparam = array('morecss'=>'btnTitleSelected'); -$morehtmlright = dolGetButtonTitle($langs->trans("List"), '', 'fa fa-list paddingleft imgforviewmode', DOL_URL_ROOT.'/user/list.php'.(($search_statut != '' && $search_statut >= 0) ? '?search_statut='.$search_statut : ''), '', 1, $moreparam); +$morehtmlright = dolGetButtonTitle($langs->trans("List"), '', 'fa fa-list paddingleft imgforviewmode', DOL_URL_ROOT.'/user/list.php'.(($search_status != '' && $search_status >= 0) ? '?search_status='.$search_status : ''), '', 1, $moreparam); $moreparam = array('morecss'=>'marginleftonly'); -$morehtmlright .= dolGetButtonTitle($langs->trans("HierarchicView"), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/user/hierarchy.php'.(($search_statut != '' && $search_statut >= 0) ? '?search_statut='.$search_statut : ''), '', 1, $moreparam); +$morehtmlright .= dolGetButtonTitle($langs->trans("HierarchicView"), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/user/hierarchy.php'.(($search_status != '' && $search_status >= 0) ? '?search_status='.$search_status : ''), '', 1, $moreparam); */ print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'user', 0, $morehtmlright.' '.$newcardbutton, '', $limit, 0, 0, 1); @@ -832,7 +832,7 @@ if (!empty($arrayfields['u.tms']['checked'])) { if (!empty($arrayfields['u.statut']['checked'])) { // Status print ''; - print $form->selectarray('search_statut', array('-1' => '', '0' => $langs->trans('Disabled'), '1' => $langs->trans('Enabled')), $search_statut, 0, 0, 0, '', 0, 0, 0, '', 'search_status width100 onrightofpage'); + print $form->selectarray('search_status', array('-1' => '', '0' => $langs->trans('Disabled'), '1' => $langs->trans('Enabled')), $search_status, 0, 0, 0, '', 0, 0, 0, '', 'search_status width100 onrightofpage'); print ''; } // Action column