diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index a82827c30ee..e66a0ac1a02 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -9326,7 +9326,7 @@ function natural_search($fields, $value, $mode = 0, $nofirstand = 0) $reg = array(); preg_match('/([<>=]+)/', $crit, $reg); - if ($reg[1]) { + if (!empty($reg[1])) { $operator = $reg[1]; } if ($newcrit != '') { diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php index 942cbf2b482..5353b713207 100644 --- a/htdocs/holiday/card.php +++ b/htdocs/holiday/card.php @@ -49,6 +49,7 @@ $confirm = GETPOST('confirm', 'alpha'); $id = GETPOST('id', 'int'); $ref = GETPOST('ref', 'alpha'); $fuserid = (GETPOST('fuserid', 'int') ?GETPOST('fuserid', 'int') : $user->id); +$socid = GETPOST('socid', 'int'); // Load translation files required by the page $langs->loadLangs(array("other", "holiday", "mails", "trips")); @@ -987,6 +988,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') { print dol_get_fiche_head('', '', '', -1); $out = ''; + $nb_holiday = 0; $typeleaves = $object->getTypes(1, 1); foreach ($typeleaves as $key => $val) { $nb_type = $object->getCPforUser($user->id, $val['rowid']); diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php index dedc7d1da0f..0a557b0db76 100644 --- a/htdocs/holiday/define_holiday.php +++ b/htdocs/holiday/define_holiday.php @@ -35,6 +35,8 @@ $langs->loadlangs(array('users', 'other', 'holiday', 'hrm')); $action = GETPOST('action', 'aZ09'); $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'defineholidaylist'; +$massaction = GETPOST('massaction', 'alpha'); +$optioncss = GETPOST('optioncss', 'alpha'); $search_name = GETPOST('search_name', 'alpha'); $search_supervisor = GETPOST('search_supervisor', 'int'); diff --git a/htdocs/holiday/month_report.php b/htdocs/holiday/month_report.php index 67c860e6f70..bfde7e34191 100644 --- a/htdocs/holiday/month_report.php +++ b/htdocs/holiday/month_report.php @@ -36,6 +36,8 @@ $langs->loadLangs(array('holiday', 'hrm')); // Security check $socid = 0; +$id = GETPOST('id', 'int'); + if ($user->socid > 0) { // Protection if external user //$socid = $user->socid; accessforbidden(); @@ -63,6 +65,11 @@ if (!$sortorder) { $sortorder = "ASC"; } +$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int'); +if (empty($page) || $page == -1) { + $page = 0; +} + $hookmanager->initHooks(array('leavemovementlist')); $arrayfields = array(); diff --git a/htdocs/holiday/view_log.php b/htdocs/holiday/view_log.php index 7dffc0adbfe..f2ee7d4cae4 100644 --- a/htdocs/holiday/view_log.php +++ b/htdocs/holiday/view_log.php @@ -306,6 +306,9 @@ print ''; print '
'; $moreforfilter = ''; +$morefilter = ''; +$disabled = 0; +$include = ''; $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; $selectedfields = '';