Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-15 05:51:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Clean code

Browse Source
This commit is contained in:
Laurent Destailleur
2024-08-01 13:07:12 +02:00
parent 46eb5f83c2
commit 4fc272698f
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/lib/functions.lib.php
View File

@@ -13628,7 +13628,7 @@ function dolForgeCriteriaCallback($matches)
} else {
if (strtoupper($tmpescaped) == 'NULL') {
$tmpescaped = 'NULL';
} elseif (ctype_digit((string) $tmpescaped)) {
} elseif (is_numeric((string) $tmpescaped)) {
$tmpescaped = (int) $tmpescaped;
} else {
$tmpescaped = (float) $tmpescaped;

4
htdocs/core/lib/project.lib.php
View File

@@ -2585,10 +2585,10 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
$sql .= " AND p.fk_statut = ".(int) $status;
}
if (getDolGlobalString('PROJECT_LIMIT_YEAR_RANGE')) {
$project_year_filter = GETPOST("project_year_filter");
$project_year_filter = GETPOST("project_year_filter", 'alpha'); // '*' seems allowed
//Check if empty or invalid year. Wildcard ignores the sql check
if ($project_year_filter != "*") {
if (empty($project_year_filter) || !ctype_digit($project_year_filter)) {
if (empty($project_year_filter) || !is_numeric($project_year_filter)) {
$project_year_filter = date("Y");
}
$sql .= " AND (p.dateo IS NULL OR p.dateo <= ".$db->idate(dol_get_last_day($project_year_filter, 12, false)).")";