From 5b703aa41318b0e93a37e86035a4556d8709ce61 Mon Sep 17 00:00:00 2001
From: Thomas Zilio <Dasc3er@users.noreply.github.com>
Date: Wed, 11 Sep 2019 18:11:19 +0200
Subject: [PATCH] Fix invio email
---
lib/functions.php | 1 -
mail.php | 5 ++++-
src/HTMLBuilder/Manager/ButtonManager.php | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/lib/functions.php b/lib/functions.php
index eb0046b7c..01c4a7f3c 100644
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -220,7 +220,6 @@ function translateTemplate()
OperationLog::build($op);
}
- //dd("afssa", $op, $_POST);exit();
// Retrocompatibilità
if (!empty($_SESSION['infos'])) {
diff --git a/mail.php b/mail.php
index 1df3bc4ee..df0f690e8 100644
--- a/mail.php
+++ b/mail.php
@@ -43,7 +43,10 @@ if (sizeof($campi_mancanti) > 0) {
echo '
<form action="" method="post" id="email-form">
<input type="hidden" name="op" value="send-email">
- <input type="hidden" name="backto" value="record-edit">
+ <input type="hidden" name="backto" value="'.(get('back') ? get('back') : 'record-edit').'">
+
+ <input type="hidden" name="id_module" value="'.$id_module.'">
+ <input type="hidden" name="id_record" value="'.$id_record.'">
<input type="hidden" name="template" value="'.$template['id'].'">
diff --git a/src/HTMLBuilder/Manager/ButtonManager.php b/src/HTMLBuilder/Manager/ButtonManager.php
index ca72c9054..0b9fdbadb 100644
--- a/src/HTMLBuilder/Manager/ButtonManager.php
+++ b/src/HTMLBuilder/Manager/ButtonManager.php
@@ -41,7 +41,7 @@ class ButtonManager implements ManagerInterface
$template = Template::find($options['id']);
$result = [
- 'link' => ROOTDIR.'/mail.php?id_module='.$options['id_module'].'&id_record='.$options['id_record'].'&id='.$options['id'],
+ 'link' => ROOTDIR.'/mail.php?id_module='.$options['id_module'].'&id_record='.$options['id_record'].'&id='.$options['id'].$options['parameters'],
'title' => tr('Invia').' '.((strtoupper($template['name']) == $template['name']) ? $template['name'] : lcfirst($template['name'])),
'icon' => $template['icon'],
'type' => 'modal',