Mascali
/
raspisms
mirror of https://github.com/RaspbianFrance/raspisms.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update templating and conditional groups to add contact_metas

This commit is contained in:
osaajani 2020-09-26 21:34:42 +02:00
parent 6062446027
commit 8d86f576d8
4 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
controllers/internals/ConditionalGroup.php
View File

@ -114,8 +114,13 @@ namespace controllers\internals;
{ {
$contact['datas'] = json_decode($contact['datas']); $contact['datas'] = json_decode($contact['datas']);
$contact = (object) $contact; $contact = (object) $contact;
//Add metas of contact by adding contact without datas
$metas = clone $contact;
unset($metas->datas);
unset($metas->id_user);
$datas = ['contact' => $contact->datas]; $datas = ['contact' => $contact->datas, 'contact_metas' => $metas];
$is_valid = $ruler->evaluate_condition($condition, $datas); $is_valid = $ruler->evaluate_condition($condition, $datas);
if (!$is_valid) if (!$is_valid)
{ {

10
controllers/internals/Scheduled.php
View File

@ -335,7 +335,15 @@ namespace controllers\internals;
if ((int) ($users_settings[$scheduled['id_user']]['templating'] ?? false)) if ((int) ($users_settings[$scheduled['id_user']]['templating'] ?? false))
{ {
$contact['datas'] = json_decode($contact['datas'], true); $contact['datas'] = json_decode($contact['datas'], true);
$datas = ['contact' => $contact['datas']];
//Add metas of contact by adding contact without datas
$metas = $contact;
unset($metas['datas']);
unset($metas['id_user']);
$datas = ['contact' => $contact['datas'], 'contact_metas' => $metas];
$render = $internal_templating->render($scheduled['text'], $datas); $render = $internal_templating->render($scheduled['text'], $datas);
if (!$render['success']) if (!$render['success'])

2
controllers/publics/ConditionalGroup.php
View File

@ -213,7 +213,7 @@ namespace controllers\publics;
} }
$internal_ruler = new \controllers\internals\Ruler(); $internal_ruler = new \controllers\internals\Ruler();
$valid_condition = $internal_ruler->validate_condition($condition, ['contact' => (object) ['datas' => (object) null]]); $valid_condition = $internal_ruler->validate_condition($condition, ['contact' => (object) ['datas' => (object) null], 'contact_metas' => (object) null]);
if (!$valid_condition) if (!$valid_condition)
{ {
$return['result'] = 'Syntaxe de la condition invalide.'; $return['result'] = 'Syntaxe de la condition invalide.';

6
controllers/publics/Templating.php
View File

@ -68,8 +68,14 @@ namespace controllers\publics;
$contact['datas'] = json_decode($contact['datas'], true); $contact['datas'] = json_decode($contact['datas'], true);
//Add metas of contact by adding contact without datas
$metas = $contact;
unset($metas['datas']);
unset($metas['id_user']);
$datas = [ $datas = [
'contact' => $contact['datas'], 'contact' => $contact['datas'],
'contact_metas' => $metas,
]; ];
$result = $this->internal_templating->render($template, $datas); $result = $this->internal_templating->render($template, $datas);