mkrieger/Wachalarm-IP-Web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update Do 2. Jul 23:01:01 CEST 2020

Browse Source
This commit is contained in:
Robert Richter 2020-07-02 23:01:01 +02:00
parent ee32e94c07
commit a7ce4c3b3d
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/app_cfg.js
View File

@ -42,6 +42,7 @@ app_cfg.rmld = {
mailserver_host: 'smtp.xxx.xxx', mailserver_host: 'smtp.xxx.xxx',
mailserver_port: 587, mailserver_port: 587,
secure_mail: false, secure_mail: false,
unauthorized_mail: false,
mail_user: 'testuser', mail_user: 'testuser',
mail_pass: 'testuserpass',//'testpass', mail_pass: 'testuserpass',//'testpass',
mail_from: 'xyz@xxx.xxx'//'keineantwort@wachalarm.info.tm' mail_from: 'xyz@xxx.xxx'//'keineantwort@wachalarm.info.tm'

2
server/sql_qry.js
View File

@ -844,7 +844,7 @@ module.exports = function (db, app_cfg) {
function db_vmtl_get_list(waip_id, callback) { function db_vmtl_get_list(waip_id, callback) {
// Pruefen ob fuer eine Wache im Einsatz ein Verteilerliste hinterlegt ist // Pruefen ob fuer eine Wache im Einsatz ein Verteilerliste hinterlegt ist
db.get(`select v.waip_wachenname, v.vmtl_typ, v.vmtl_account_name, v.vmtl_account_group from waip_vmtl v db.get(`select v.waip_wachenname, v.vmtl_typ, v.vmtl_account_name, v.vmtl_account_group from waip_vmtl v
where v.waip_wachenname = (select distinct w.name_wache waip_wachenname from waip_wachen w left join waip_einsatzmittel em on em.wachenname = w.name_wache where v.waip_wachenname in (select distinct w.name_wache waip_wachenname from waip_wachen w left join waip_einsatzmittel em on em.wachenname = w.name_wache
where em.waip_einsaetze_ID = ?)`, [waip_id], function (err, liste) { where em.waip_einsaetze_ID = ?)`, [waip_id], function (err, liste) {
if (err == null && liste) { if (err == null && liste) {
// waip_id zu Daten hinzufuegen // waip_id zu Daten hinzufuegen

3
server/waip.js
View File

@ -403,7 +403,6 @@ module.exports = function (io, sql, fs, brk, async, app_cfg) {
var validmail = /\S+@\S+\.\S+/; var validmail = /\S+@\S+\.\S+/;
if (validmail.test(export_data.export_recipient)) { if (validmail.test(export_data.export_recipient)) {
// Mail-Server // Mail-Server
// BUG Mail wird bei selbst signiertem Zertifikat nicht verschickt
var transport = nodemailer.createTransport({ var transport = nodemailer.createTransport({
host: app_cfg.rmld.mailserver_host, host: app_cfg.rmld.mailserver_host,
port: app_cfg.rmld.mailserver_port, port: app_cfg.rmld.mailserver_port,
@ -413,7 +412,7 @@ module.exports = function (io, sql, fs, brk, async, app_cfg) {
pass: app_cfg.rmld.mail_pass pass: app_cfg.rmld.mail_pass
}, },
tls: { tls: {
rejectUnauthorized: false rejectUnauthorized: app_cfg.rmld.unauthorized_mail
} }
}); });
var mail_message = { var mail_message = {