Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-03 15:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

NEW Accept the __NOW__ and __USER_ID__key into filters

Browse Source
This commit is contained in:
Laurent Destailleur
2024-03-25 23:51:09 +01:00
parent 15f1699de7
commit 4efa503400
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12805,6 +12805,8 @@ function jsonOrUnserialize($stringtodecode)
*/
function forgeSQLFromUniversalSearchCriteria($filter, &$errorstr = '', $noand = 0, $nopar = 0, $noerror = 0)
{
global $db, $user;
if ($filter === '') {
return '';
}
@@ -12838,7 +12840,16 @@ function forgeSQLFromUniversalSearchCriteria($filter, &$errorstr = '', $noand =
}
}
return ($noand ? "" : " AND ").($nopar ? "" : '(').preg_replace_callback('/'.$regexstring.'/i', 'dolForgeCriteriaCallback', $filter).($nopar ? "" : ')');
$ret = ($noand ? "" : " AND ").($nopar ? "" : '(').preg_replace_callback('/'.$regexstring.'/i', 'dolForgeCriteriaCallback', $filter).($nopar ? "" : ')');
if (is_object($db)) {
$ret = str_replace('__NOW__', $db->idate(dol_now()), $ret);
}
if (is_object($user)) {
$ret = str_replace('__USER_ID__', (int) $user->id, $ret);
}
return $ret;
}
/**