-
-
- {[ "type": "text", "label": "'.tr('Oggetto').'", "name": "subject", "value": "'.$subject.'", "required": 1 ]}
-
+if (!empty($smtp['cc'])) {
+ echo '
+
'.tr('CC').': '.$smtp['cc'].'
';
+}
-
- {[ "type": "email", "label": "'.tr('Destinatario').'", "name": "email", "value": "'.$email.'", "required": 1 ]}
-
-
+if (!empty($smtp['cc'])) {
+ echo '
+
'.tr('CCN').': '.$smtp['bcc'].'
';
+}
-
-
- {[ "type": "textarea", "label": "'.tr('Contenuto').'", "name": "body", "value": '.json_encode($body).' ]}
-
-
+echo '
+
+
'.tr('Destinatari').'
+
+
+ {[ "type": "email", "name": "destinatari[]", "value": "'.$email.'", "icon-before": "choice|email", "extra": "onkeyup=\'aggiungi_destinatario();\'", "class": "destinatari", "required": 1 ]}
+
+
+
+
+
+
+
+ {[ "type": "text", "label": "'.tr('Oggetto').'", "name": "subject", "value": "'.$subject.'", "required": 1 ]}
+
+
+
+ {[ "type": "checkbox", "label": "'.tr('Notifica di lettura').'", "name": "read_notify", "value": "'.$template['read_notify'].'" ]}
+
+
';
+
+// Stampe
+$selected_prints = $dbo->fetchArray('SELECT id_print FROM zz_email_print WHERE id_email = '.prepare($template['id']));
+$selected = array_column($selected_prints, 'id_print');
+
+echo '
+
+
+
+ {[ "type": "select", "multiple": "1", "label": "'.tr('Stampe').'", "name": "prints[]", "value": "'.implode(',', $selected).'", "values": "query=SELECT id, title AS text FROM zz_prints WHERE id_module = '.prepare($id_module).'" ]}
+
';
+
+// Allegati
+echo '
+
+
+ {[ "type": "select", "multiple": "1", "label": "'.tr('Allegati').'", "name": "attachments[]", "values": "query=SELECT id, nome AS text FROM zz_files WHERE id_module = '.prepare($id_module).' AND id_record = '.prepare($id_record)." UNION SELECT id, CONCAT(nome, ' (Azienda)') AS text FROM zz_files WHERE id_module = ".prepare(Modules::get('Anagrafiche')['id'])." AND id_record = (SELECT valore FROM zz_settings WHERE nome = 'Azienda predefinita')\" ]}
+
+
";
+
+echo '
+
+
+
+ {[ "type": "textarea", "label": "'.tr('Contenuto').'", "name": "body", "value": '.json_encode($body).' ]}
';
echo '
-
-
-
-
-
-
-
'.tr('Stampe').'
-
-
-
';
-
-$selected_prints = $dbo->fetchArray('SELECT id_print FROM zz_email_print WHERE id_email = '.prepare($template['id']));
-$selected = array_column($selected_prints, 'id_print');
-
-$prints = Prints::getModulePrints($id_module);
-foreach ($prints as $print) {
- echo '
- {[ "type": "checkbox", "label": "'.$print['title'].'", "name": "print-'.$print['id'].'", "value": "'.in_array($print['id'], $selected).'" ]}';
-}
-
-echo '
-
-
-
-
-
-
-
-
-
'.tr('Allegati').'
-
-
-
';
-
-$attachments = $dbo->fetchArray('SELECT * FROM zz_files WHERE id_module = '.prepare($id_module).' AND id_record = '.prepare($id_record));
-
-if (empty($attachments)) {
- echo '
-
'.tr('Nessun allegato disponibile').'.
';
-}
-
-foreach ($attachments as $attachment) {
- echo '
- {[ "type": "checkbox", "label": "'.$attachment['nome'].'", "name": "attachment-'.$attachment['id'].'" ]}';
-}
-
-echo '
-
-
-
-
-
-
-
-
-
'.tr('Anagrafica').'
-
-
-
';
-
-$attachments = $dbo->fetchArray('SELECT * FROM zz_files WHERE id_module = '.prepare(Modules::get('Anagrafiche')['id'])." AND id_record = (SELECT valore FROM zz_settings WHERE nome = 'Azienda predefinita')");
-
-if (empty($attachments)) {
- echo '
-
'.tr('Nessun allegato disponibile').'.
';
-}
-
-foreach ($attachments as $attachment) {
- echo '
- {[ "type": "checkbox", "label": "'.$attachment['nome'].'", "name": "default-'.$attachment['id'].'" ]}';
-}
-
-echo '
-
-
-
-
-
-
+
';
+echo '
+
';
+
echo '
';
echo '
';
echo '
diff --git a/modules/interventi/variables.php b/modules/interventi/variables.php
new file mode 100644
index 000000000..6fa1d65e5
--- /dev/null
+++ b/modules/interventi/variables.php
@@ -0,0 +1,7 @@
+fetchArray('SELECT * FROM in_interventi WHERE id='.prepare($id_record))[0];
+
+return [
+ 'id_anagrafica' => $rs['idanagrafica'],
+];
diff --git a/modules/smtp/ajax/complete.php b/modules/smtp/ajax/complete.php
new file mode 100644
index 000000000..0ca34cb04
--- /dev/null
+++ b/modules/smtp/ajax/complete.php
@@ -0,0 +1,52 @@
+fetchArray($q);
+ foreach ($rs as $r) {
+ $results[] = [
+ 'value' => $r['email'],
+ 'label' => $r['ragione_sociale'].' <'.$r['email'].'>',
+ ];
+ }
+
+ // Tutti gli agenti
+ $q = "SELECT DISTINCT(email), ragione_sociale, an_anagrafiche.idanagrafica FROM an_anagrafiche INNER JOIN an_tipianagrafiche_anagrafiche ON an_anagrafiche.idanagrafica=an_tipianagrafiche_anagrafiche.idanagrafica WHERE idtipoanagrafica = (SELECT idtipoanagrafica FROM an_tipianagrafiche WHERE descrizione='Agente') AND email != '' ORDER BY idanagrafica";
+
+ $rs = $dbo->fetchArray($q);
+ foreach ($rs as $r) {
+ $results[] = [
+ 'value' => $r['email'],
+ 'label' => $r['ragione_sociale'].' <'.$r['email'].'>',
+ ];
+ }
+
+ // Email del cliente
+ $q = "SELECT DISTINCT(email), ragione_sociale, idanagrafica FROM an_anagrafiche WHERE email != '' ".$where.' ORDER BY idanagrafica';
+
+ $rs = $dbo->fetchArray($q);
+ foreach ($rs as $r) {
+ $results[] = [
+ 'value' => $r['email'],
+ 'label' => $r['ragione_sociale'].' <'.$r['email'].'>',
+ ];
+ }
+
+ echo json_encode($results);
+
+ break;
+}
diff --git a/modules/utenti/user.php b/modules/utenti/user.php
index 9b2d28c88..5d6289101 100644
--- a/modules/utenti/user.php
+++ b/modules/utenti/user.php
@@ -60,14 +60,14 @@ if ($self_edit) {
echo '
-
+
{[ "type": "password", "label": "'.tr('Password').'", "name": "password1", "required": 1, "value": "" ]}
';
echo '
-
+
{[ "type": "password", "label": "'.tr('Ripeti la password').'", "name": "password2", "value": "" ]}
';
diff --git a/src/HTMLBuilder/Wrapper/HTMLWrapper.php b/src/HTMLBuilder/Wrapper/HTMLWrapper.php
index 6c494a042..c6092ef04 100644
--- a/src/HTMLBuilder/Wrapper/HTMLWrapper.php
+++ b/src/HTMLBuilder/Wrapper/HTMLWrapper.php
@@ -118,28 +118,43 @@ class HTMLWrapper implements WrapperInterface
{
$result = null;
- $choices = [
- [
- 'id' => 'UNT',
- 'descrizione' => tr('€'),
- ],
- [
- 'id' => 'PRC',
- 'descrizione' => '%',
- ],
- ];
-
$pieces = explode('|', $string);
-
$type = $pieces[1];
- $value = (empty($pieces[2]) || !in_array($pieces[2], array_column($choices, 'id'))) ? 'UNT' : $pieces[2];
if ($type == 'untprc') {
- $result = '{[ "type": "select", "name": "tipo_'.prepareToField($values['name']).'", "value": "'.prepareToField($value).'", "values": '.json_encode($choices).', "class": "no-search" ]}';
-
- $result = \HTMLBuilder\HTMLBuilder::replace($result);
+ $choices = [
+ [
+ 'id' => 'UNT',
+ 'descrizione' => tr('€'),
+ ],
+ [
+ 'id' => 'PRC',
+ 'descrizione' => '%',
+ ],
+ ];
+ } elseif ($type == 'email') {
+ $choices = [
+ [
+ 'id' => 'a',
+ 'descrizione' => tr('A').' ',
+ ],
+ [
+ 'id' => 'cc',
+ 'descrizione' => tr('CC').' ',
+ ],
+ [
+ 'id' => 'bcc',
+ 'descrizione' => tr('CCN'),
+ ],
+ ];
}
+ $value = (empty($pieces[2]) || !in_array($pieces[2], array_column($choices, 'id'))) ? $choices[0]['id'] : $pieces[2];
+
+ $result = '{[ "type": "select", "name": "tipo_'.prepareToField($values['name']).'", "value": "'.prepareToField($value).'", "values": '.json_encode($choices).', "class": "no-search" ]}';
+
+ $result = \HTMLBuilder\HTMLBuilder::replace($result);
+
return $result;
}
}
diff --git a/src/Mail.php b/src/Mail.php
index 8ef037928..81639867e 100644
--- a/src/Mail.php
+++ b/src/Mail.php
@@ -120,15 +120,18 @@ class Mail extends PHPMailer\PHPMailer\PHPMailer
*
* @return array
*/
- public static function getTemplateVariables($template)
+ public static function getTemplateVariables($template, $id_record)
{
$template = self::getTemplate($template);
$module = Modules::get($template['id_module']);
- $directory = DOCROOT.'/modules/'.$module['directory'].'|custom|/variables.php';
+ $file = DOCROOT.'/modules/'.$module['directory'].'|custom|/variables.php';
- $original_file = str_replace('|custom|', '', $directory).'form.php';
- $custom_file = str_replace('|custom|', '/custom', $directory).'form.php';
+ $original_file = str_replace('|custom|', '', $file);
+ $custom_file = str_replace('|custom|', '/custom', $file);
+
+ $database = Database::getConnection();
+ $dbo = $database;
// Lettura delle variabili nei singoli moduli
if (file_exists($custom_file)) {