From e3768911622d0b0286631625d097bf370f892f4f Mon Sep 17 00:00:00 2001 From: VESSILLER Date: Thu, 1 Dec 2022 15:55:30 +0100 Subject: [PATCH 1/4] NEW subsitute date now in email collector --- htdocs/emailcollector/class/emailcollector.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php index 8d72666ad53..b369d9933ba 100644 --- a/htdocs/emailcollector/class/emailcollector.class.php +++ b/htdocs/emailcollector/class/emailcollector.class.php @@ -989,6 +989,7 @@ class EmailCollector extends CommonObject } } } + $substitutionarray['__DATE_NOW__'] = dol_now(); //var_dump($substitutionarray); dol_syslog(var_export($substitutionarray, true)); //var_dump($substitutionarray); From e608705cb6db78abc8040f5f976d63111519ff16 Mon Sep 17 00:00:00 2001 From: VESSILLER Date: Thu, 1 Dec 2022 16:07:56 +0100 Subject: [PATCH 2/4] FIX reload stickler-ci From f510357f859cdc712871fe65bfb0d82792c7d0d6 Mon Sep 17 00:00:00 2001 From: VESSILLER Date: Tue, 6 Dec 2022 16:19:14 +0100 Subject: [PATCH 3/4] NEW getCommonSubstitutionArray to have more substitute keys --- .../class/emailcollector.class.php | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php index b369d9933ba..fcf631f55fa 100644 --- a/htdocs/emailcollector/class/emailcollector.class.php +++ b/htdocs/emailcollector/class/emailcollector.class.php @@ -881,8 +881,24 @@ class EmailCollector extends CommonObject */ private function overwritePropertiesOfObject(&$object, $actionparam, $messagetext, $subject, $header, &$operationslog) { + global $conf, $langs; + $errorforthisaction = 0; + // set output lang + $outputlangs = $langs; + $newlang = ''; + if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) { + $newlang = GETPOST('lang_id', 'aZ09'); + } + if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang)) { + $newlang = $object->thirdparty->default_lang; + } + if (!empty($newlang)) { + $outputlangs = new Translate('', $conf); + $outputlangs->setDefaultLang($newlang); + } + // Overwrite values with values extracted from source email // $this->actionparam = 'opportunity_status=123;abc=EXTRACT:BODY:....' $arrayvaluetouse = dolExplodeIntoArray($actionparam, ';', '='); @@ -978,7 +994,8 @@ class EmailCollector extends CommonObject if ($regforregex[1] == 'SET' || empty($valuecurrent)) { $valuetouse = $regforregex[2]; - $substitutionarray = array(); + $substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object); + complete_substitutions_array($substitutionarray, $outputlangs, $object); $matcharray = array(); preg_match_all('/__([a-z0-9]+(?:_[a-z0-9]+)?)__/i', $valuetouse, $matcharray); //var_dump($tmpproperty.' - '.$object->$tmpproperty.' - '.$valuetouse); var_dump($matcharray); From e756cc8cd7f221f07560f8df4e00b97936e87e55 Mon Sep 17 00:00:00 2001 From: VESSILLER Date: Tue, 6 Dec 2022 16:24:06 +0100 Subject: [PATCH 4/4] NEW getCommonSubstitutionArray to have more substitute keys --- htdocs/emailcollector/class/emailcollector.class.php | 1 - 1 file changed, 1 deletion(-) diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php index fcf631f55fa..28dbc0835e7 100644 --- a/htdocs/emailcollector/class/emailcollector.class.php +++ b/htdocs/emailcollector/class/emailcollector.class.php @@ -1006,7 +1006,6 @@ class EmailCollector extends CommonObject } } } - $substitutionarray['__DATE_NOW__'] = dol_now(); //var_dump($substitutionarray); dol_syslog(var_export($substitutionarray, true)); //var_dump($substitutionarray);