From 08aed338c12eb5eba6a99150cb3ee32249c6b200 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Tue, 26 Mar 2024 22:35:21 +0100 Subject: [PATCH] FIX phan phan la tulip --- htdocs/admin/emailcollector_card.php | 4 ++-- htdocs/core/lib/functions.lib.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/admin/emailcollector_card.php b/htdocs/admin/emailcollector_card.php index 6b62e14d87c..bb656ab09b7 100644 --- a/htdocs/admin/emailcollector_card.php +++ b/htdocs/admin/emailcollector_card.php @@ -552,8 +552,8 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea $connectstringtarget = $connectstringserver.$object->getEncodedUtf7($targetdir); } - $timeoutconnect = getDolGlobalString('MAIN_USE_CONNECT_TIMEOUT', 5); - $timeoutread = getDolGlobalString('MAIN_USE_RESPONSE_TIMEOUT', 20); + $timeoutconnect = getDolGlobalInt('MAIN_USE_CONNECT_TIMEOUT', 5); + $timeoutread = getDolGlobalInt('MAIN_USE_RESPONSE_TIMEOUT', 20); dol_syslog("imap_open connectstring=".$connectstringsource." login=".$object->login." password=".$object->password." timeoutconnect=".$timeoutconnect." timeoutread=".$timeoutread); diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index a5555b0511b..3ff1c19a100 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -12858,7 +12858,7 @@ function forgeSQLFromUniversalSearchCriteria($filter, &$errorstr = '', $noand = $ret = str_replace('__NOW__', $db->idate(dol_now()), $ret); } if (is_object($user)) { - $ret = str_replace('__USER_ID__', (int) $user->id, $ret); + $ret = str_replace('__USER_ID__', (string) $user->id, $ret); } return $ret;