From f8a78150131a82f77393c5cf844d33a2862a975b Mon Sep 17 00:00:00 2001 From: simatec Date: Tue, 3 Dec 2024 09:20:39 +0100 Subject: [PATCH] (simatec) Code fix --- lib/scripts/96-discord.js | 48 ++++++++++++++--------------- lib/scripts/96-email.js | 52 +++++++++++++++---------------- lib/scripts/96-gotify.js | 48 ++++++++++++++--------------- lib/scripts/96-matrix.js | 48 ++++++++++++++--------------- lib/scripts/96-pushover.js | 56 +++++++++++++++++----------------- lib/scripts/96-signal.js | 52 +++++++++++++++---------------- lib/scripts/96-telegram.js | 56 +++++++++++++++++----------------- lib/scripts/96-whatsapp.js | 50 +++++++++++++++--------------- lib/scripts/99-notification.js | 48 ++++++++++++++--------------- 9 files changed, 229 insertions(+), 229 deletions(-) diff --git a/lib/scripts/96-discord.js b/lib/scripts/96-discord.js index f59c4531..ceeb81b8 100644 --- a/lib/scripts/96-discord.js +++ b/lib/scripts/96-discord.js @@ -71,21 +71,21 @@ function command(options, log, callback) { errorMessage += '\n'; - if (options.context.errors.iobroker) errorMessage += '\niobroker: ' + options.context.errors.iobroker; - if (options.context.errors.redis) errorMessage += '\nredis: ' + options.context.errors.redis; - if (options.context.errors.historyDB) errorMessage += '\nhistoryDB: ' + options.context.errors.historyDB; - if (options.context.errors.influxDB) errorMessage += '\ninfluxDB: ' + options.context.errors.influxDB; - if (options.context.errors.sqlite) errorMessage += '\nsqlite: ' + options.context.errors.sqlite; - if (options.context.errors.nodered) errorMessage += '\nnodered: ' + options.context.errors.nodered; - if (options.context.errors.yahka) errorMessage += '\nyahka: ' + options.context.errors.yahka; - if (options.context.errors.zigbee) errorMessage += '\nzigbee: ' + options.context.errors.zigbee; - if (options.context.errors.zigbee2mqtt) errorMessage += '\nzigbee2mqtt: ' + options.context.errors.zigbee2mqtt; - if (options.context.errors.javascripts) errorMessage += '\njavascripts: ' + options.context.errors.javascripts; - if (options.context.errors.jarvis) errorMessage += '\njarvis: ' + options.context.errors.jarvis; - if (options.context.errors.clean) errorMessage += '\nclean: ' + options.context.errors.clean; + if (options.context.errors.iobroker) errorMessage += `\niobroker: ${options.context.errors.iobroker}`; + if (options.context.errors.redis) errorMessage += `\nredis: ${options.context.errors.redis}`; + if (options.context.errors.historyDB) errorMessage += `\nhistoryDB: ${options.context.errors.historyDB}`; + if (options.context.errors.influxDB) errorMessage += `\ninfluxDB: ${options.context.errors.influxDB}`; + if (options.context.errors.sqlite) errorMessage += `\nsqlite: ${options.context.errors.sqlite}`; + if (options.context.errors.nodered) errorMessage += `\nnodered: ${options.context.errors.nodered}`; + if (options.context.errors.yahka) errorMessage += `\nyahka: ${options.context.errors.yahka}`; + if (options.context.errors.zigbee) errorMessage += `\nzigbee: ${options.context.errors.zigbee}`; + if (options.context.errors.zigbee2mqtt) errorMessage += `\nzigbee2mqtt: ${options.context.errors.zigbee2mqtt}`; + if (options.context.errors.javascripts) errorMessage += `\njavascripts: ${options.context.errors.javascripts}`; + if (options.context.errors.jarvis) errorMessage += `\njarvis: ${options.context.errors.jarvis}`; + if (options.context.errors.clean) errorMessage += `\nclean: ${options.context.errors.clean}`; if (options.context.errors.mount) { - errorMessage += '\nmount: ' + options.context.errors.mount; + errorMessage += `\nmount: ${options.context.errors.mount}`; try { const formatPass = options.cifs.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.cifs && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -94,7 +94,7 @@ function command(options, log, callback) { } } if (options.context.errors.mysql) { - errorMessage += '\nmysql: ' + options.context.errors.mysql; + errorMessage += `\nmysql: ${options.context.errors.mysql}`; try { const formatPass = options.mysql.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.mysql && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -103,7 +103,7 @@ function command(options, log, callback) { } } if (options.context.errors.grafana) { - errorMessage += '\ngrafana: ' + options.context.errors.grafana; + errorMessage += `\ngrafana: ${options.context.errors.grafana}`; try { const formatPass = options.grafana.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.grafana && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -116,7 +116,7 @@ function command(options, log, callback) { } if (options.context.errors.webdav) { - errorMessage += '\nwebdav: ' + options.context.errors.webdav; + errorMessage += `\nwebdav: ${options.context.errors.webdav}`; try { const formatPass = options.webdav.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.webdav && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -125,7 +125,7 @@ function command(options, log, callback) { } } if (options.context.errors.pgsql) { - errorMessage += '\npgsql: ' + options.context.errors.pgsql; + errorMessage += `\npgsql: ${options.context.errors.pgsql}`; try { const formatPass = options.pgsql.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.pgsql && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -134,7 +134,7 @@ function command(options, log, callback) { } } if (options.context.errors.ccu) { - errorMessage += '\nccu: ' + options.context.errors.ccu; + errorMessage += `\nccu: ${options.context.errors.ccu}`; try { const formatPass = options.ccu.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.ccu && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -143,7 +143,7 @@ function command(options, log, callback) { } } if (options.context.errors.ftp) { - errorMessage += '\nftp: ' + options.context.errors.ftp; + errorMessage += `\nftp: ${options.context.errors.ftp}`; try { const formatPass = options.ftp.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.ftp && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -152,7 +152,7 @@ function command(options, log, callback) { } } if (options.context.errors.dropbox) { - errorMessage += '\ndropbox: ' + options.context.errors.dropbox; + errorMessage += `\ndropbox: ${options.context.errors.dropbox}`; try { const formatPass = options.dropbox.accessToken.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.dropbox && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -161,7 +161,7 @@ function command(options, log, callback) { } } if (options.context.errors.onedrive) { - errorMessage += '\nonedrive: ' + options.context.errors.onedrive; + errorMessage += `\nonedrive: ${options.context.errors.onedrive}`; try { const formatPass = options.onedrive.onedriveAccessJson.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.onedrive && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -170,7 +170,7 @@ function command(options, log, callback) { } } if (options.context.errors.googledrive) { - errorMessage += '\ngoogledrive: ' + options.context.errors.googledrive; + errorMessage += `\ngoogledrive: ${options.context.errors.googledrive}`; try { const formatPass = options.googledrive.accessJson.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.googledrive && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -180,7 +180,7 @@ function command(options, log, callback) { } if (options.context.errors.cifs) { - errorMessage += '\ncifs: ' + options.context.errors.cifs; + errorMessage += `\ncifs: ${options.context.errors.cifs}`; try { const formatPass = options.cifs.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.cifs && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -189,7 +189,7 @@ function command(options, log, callback) { } } if (options.context.errors.umount) { - errorMessage += '\numount: ' + options.context.errors.umount; + errorMessage += `\numount: ${options.context.errors.umount}`; try { const formatPass = options.cifs.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.cifs && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); diff --git a/lib/scripts/96-email.js b/lib/scripts/96-email.js index 80b0d5f2..a092941e 100644 --- a/lib/scripts/96-email.js +++ b/lib/scripts/96-email.js @@ -64,28 +64,28 @@ function command(options, log, callback) { messageText += storageOptions; if (options.email.onlyError === false || options.email.onlyError === 'false') { - options.adapter.sendTo(options.email.instance, 'send', { text: 'Backitup:\n' + messageText, to: options.email.emailReceiver, subject: 'Backitup', from: options.email.emailSender }); + options.adapter.sendTo(options.email.instance, 'send', { text: `Backitup:\n${messageText}`, to: options.email.emailReceiver, subject: 'Backitup', from: options.email.emailSender }); } } else { let errorMessage = _('Your backup was not completely created. Please check the errors!!', options.email.systemLang); errorMessage += '\n'; - if (options.context.errors.iobroker) errorMessage += '\niobroker: ' + options.context.errors.iobroker; - if (options.context.errors.redis) errorMessage += '\nredis: ' + options.context.errors.redis; - if (options.context.errors.historyDB) errorMessage += '\nhistoryDB: ' + options.context.errors.historyDB; - if (options.context.errors.influxDB) errorMessage += '\ninfluxDB: ' + options.context.errors.influxDB; - if (options.context.errors.sqlite) errorMessage += '\nsqlite: ' + options.context.errors.sqlite; - if (options.context.errors.nodered) errorMessage += '\nnodered: ' + options.context.errors.nodered; - if (options.context.errors.yahka) errorMessage += '\nyahka: ' + options.context.errors.yahka; - if (options.context.errors.zigbee) errorMessage += '\nzigbee: ' + options.context.errors.zigbee; - if (options.context.errors.zigbee2mqtt) errorMessage += '\nzigbee2mqtt: ' + options.context.errors.zigbee2mqtt; - if (options.context.errors.javascripts) errorMessage += '\njavascripts: ' + options.context.errors.javascripts; - if (options.context.errors.jarvis) errorMessage += '\njarvis: ' + options.context.errors.jarvis; - if (options.context.errors.clean) errorMessage += '\nclean: ' + options.context.errors.clean; + if (options.context.errors.iobroker) errorMessage += `\niobroker: ${options.context.errors.iobroker}`; + if (options.context.errors.redis) errorMessage += `\nredis: ${options.context.errors.redis}`; + if (options.context.errors.historyDB) errorMessage += `\nhistoryDB: ${options.context.errors.historyDB}`; + if (options.context.errors.influxDB) errorMessage += `\ninfluxDB: ${options.context.errors.influxDB}`; + if (options.context.errors.sqlite) errorMessage += `\nsqlite: ${options.context.errors.sqlite}`; + if (options.context.errors.nodered) errorMessage += `\nnodered: ${options.context.errors.nodered}`; + if (options.context.errors.yahka) errorMessage += `\nyahka: ${options.context.errors.yahka}`; + if (options.context.errors.zigbee) errorMessage += `\nzigbee: ${options.context.errors.zigbee}`; + if (options.context.errors.zigbee2mqtt) errorMessage += `\nzigbee2mqtt: ${options.context.errors.zigbee2mqtt}`; + if (options.context.errors.javascripts) errorMessage += `\njavascripts: ${options.context.errors.javascripts}`; + if (options.context.errors.jarvis) errorMessage += `\njarvis: ${options.context.errors.jarvis}`; + if (options.context.errors.clean) errorMessage += `\nclean: ${options.context.errors.clean}`; if (options.context.errors.mount) { - errorMessage += '\nmount: ' + options.context.errors.mount; + errorMessage += `\nmount: ${options.context.errors.mount}`; try { const formatPass = options.cifs.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.cifs && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -94,7 +94,7 @@ function command(options, log, callback) { } } if (options.context.errors.mysql) { - errorMessage += '\nmysql: ' + options.context.errors.mysql; + errorMessage += `\nmysql: ${options.context.errors.mysql}`; try { const formatPass = options.mysql.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.mysql && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -103,7 +103,7 @@ function command(options, log, callback) { } } if (options.context.errors.grafana) { - errorMessage += '\ngrafana: ' + options.context.errors.grafana; + errorMessage += `\ngrafana: ${options.context.errors.grafana}`; try { const formatPass = options.grafana.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.grafana && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -116,7 +116,7 @@ function command(options, log, callback) { } if (options.context.errors.webdav) { - errorMessage += '\nwebdav: ' + options.context.errors.webdav; + errorMessage += `\nwebdav: ${options.context.errors.webdav}`; try { const formatPass = options.webdav.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.webdav && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -125,7 +125,7 @@ function command(options, log, callback) { } } if (options.context.errors.pgsql) { - errorMessage += '\npgsql: ' + options.context.errors.pgsql; + errorMessage += `\npgsql: ${options.context.errors.pgsql}`; try { const formatPass = options.pgsql.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.pgsql && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -134,7 +134,7 @@ function command(options, log, callback) { } } if (options.context.errors.ccu) { - errorMessage += '\nccu: ' + options.context.errors.ccu; + errorMessage += `\nccu: ${options.context.errors.ccu}`; try { const formatPass = options.ccu.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.ccu && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -143,7 +143,7 @@ function command(options, log, callback) { } } if (options.context.errors.ftp) { - errorMessage += '\nftp: ' + options.context.errors.ftp; + errorMessage += `\nftp: ${options.context.errors.ftp}`; try { const formatPass = options.ftp.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.ftp && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -152,7 +152,7 @@ function command(options, log, callback) { } } if (options.context.errors.dropbox) { - errorMessage += '\ndropbox: ' + options.context.errors.dropbox; + errorMessage += `\ndropbox: ${options.context.errors.dropbox}`; try { const formatPass = options.dropbox.accessToken.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.dropbox && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -161,7 +161,7 @@ function command(options, log, callback) { } } if (options.context.errors.onedrive) { - errorMessage += '\nonedrive: ' + options.context.errors.onedrive; + errorMessage += `\nonedrive: ${options.context.errors.onedrive}`; try { const formatPass = options.onedrive.onedriveAccessJson.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.onedrive && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -170,7 +170,7 @@ function command(options, log, callback) { } } if (options.context.errors.googledrive) { - errorMessage += '\ngoogledrive: ' + options.context.errors.googledrive; + errorMessage += `\ngoogledrive: ${options.context.errors.googledrive}`; try { const formatPass = options.googledrive.accessJson.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.googledrive && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -180,7 +180,7 @@ function command(options, log, callback) { } if (options.context.errors.cifs) { - errorMessage += '\ncifs: ' + options.context.errors.cifs; + errorMessage += `\ncifs: ${options.context.errors.cifs}`; try { const formatPass = options.cifs.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.cifs && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -189,7 +189,7 @@ function command(options, log, callback) { } } if (options.context.errors.umount) { - errorMessage += '\numount: ' + options.context.errors.umount; + errorMessage += `\numount: ${options.context.errors.umount}`; try { const formatPass = options.cifs.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.cifs && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -205,7 +205,7 @@ function command(options, log, callback) { } */ - options.adapter.sendTo(options.email.instance, 'send', { text: 'Backitup:\n' + errorMessage, to: options.email.emailReceiver, subject: 'Backitup', from: options.email.emailSender }); + options.adapter.sendTo(options.email.instance, 'send', { text: `Backitup:\n${errorMessage}`, to: options.email.emailReceiver, subject: 'Backitup', from: options.email.emailSender }); } } diff --git a/lib/scripts/96-gotify.js b/lib/scripts/96-gotify.js index 004d13f7..a71c26a9 100644 --- a/lib/scripts/96-gotify.js +++ b/lib/scripts/96-gotify.js @@ -76,21 +76,21 @@ function command(options, log, callback) { errorMessage += '\n'; - if (options.context.errors.iobroker) errorMessage += '\niobroker: ' + options.context.errors.iobroker; - if (options.context.errors.redis) errorMessage += '\nredis: ' + options.context.errors.redis; - if (options.context.errors.historyDB) errorMessage += '\nhistoryDB: ' + options.context.errors.historyDB; - if (options.context.errors.influxDB) errorMessage += '\ninfluxDB: ' + options.context.errors.influxDB; - if (options.context.errors.sqlite) errorMessage += '\nsqlite: ' + options.context.errors.sqlite; - if (options.context.errors.nodered) errorMessage += '\nnodered: ' + options.context.errors.nodered; - if (options.context.errors.yahka) errorMessage += '\nyahka: ' + options.context.errors.yahka; - if (options.context.errors.zigbee) errorMessage += '\nzigbee: ' + options.context.errors.zigbee; - if (options.context.errors.zigbee2mqtt) errorMessage += '\nzigbee2mqtt: ' + options.context.errors.zigbee2mqtt; - if (options.context.errors.javascripts) errorMessage += '\njavascripts: ' + options.context.errors.javascripts; - if (options.context.errors.jarvis) errorMessage += '\njarvis: ' + options.context.errors.jarvis; - if (options.context.errors.clean) errorMessage += '\nclean: ' + options.context.errors.clean; + if (options.context.errors.iobroker) errorMessage += `\niobroker: ${options.context.errors.iobroker}`; + if (options.context.errors.redis) errorMessage += `\nredis: ${options.context.errors.redis}`; + if (options.context.errors.historyDB) errorMessage += `\nhistoryDB: ${options.context.errors.historyDB}`; + if (options.context.errors.influxDB) errorMessage += `\ninfluxDB: ${options.context.errors.influxDB}`; + if (options.context.errors.sqlite) errorMessage += `\nsqlite: ${options.context.errors.sqlite}`; + if (options.context.errors.nodered) errorMessage += `\nnodered: ${options.context.errors.nodered}`; + if (options.context.errors.yahka) errorMessage += `\nyahka: ${options.context.errors.yahka}`; + if (options.context.errors.zigbee) errorMessage += `\nzigbee: ${options.context.errors.zigbee}`; + if (options.context.errors.zigbee2mqtt) errorMessage += `\nzigbee2mqtt: ${options.context.errors.zigbee2mqtt}`; + if (options.context.errors.javascripts) errorMessage += `\njavascripts: ${options.context.errors.javascripts}`; + if (options.context.errors.jarvis) errorMessage += `\njarvis: ${options.context.errors.jarvis}`; + if (options.context.errors.clean) errorMessage += `\nclean: ${options.context.errors.clean}`; if (options.context.errors.mount) { - errorMessage += '\nmount: ' + options.context.errors.mount; + errorMessage += `\nmount: ${options.context.errors.mount}`; try { const formatPass = options.cifs.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.cifs && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -99,7 +99,7 @@ function command(options, log, callback) { } } if (options.context.errors.mysql) { - errorMessage += '\nmysql: ' + options.context.errors.mysql; + errorMessage += `\nmysql: ${options.context.errors.mysql}`; try { const formatPass = options.mysql.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.mysql && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -108,7 +108,7 @@ function command(options, log, callback) { } } if (options.context.errors.grafana) { - errorMessage += '\ngrafana: ' + options.context.errors.grafana; + errorMessage += `\ngrafana: ${options.context.errors.grafana}`; try { const formatPass = options.grafana.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.grafana && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -121,7 +121,7 @@ function command(options, log, callback) { } if (options.context.errors.webdav) { - errorMessage += '\nwebdav: ' + options.context.errors.webdav; + errorMessage += `\nwebdav: ${options.context.errors.webdav}`; try { const formatPass = options.webdav.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.webdav && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -130,7 +130,7 @@ function command(options, log, callback) { } } if (options.context.errors.pgsql) { - errorMessage += '\npgsql: ' + options.context.errors.pgsql; + errorMessage += `\npgsql: ${options.context.errors.pgsql}`; try { const formatPass = options.pgsql.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.pgsql && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -139,7 +139,7 @@ function command(options, log, callback) { } } if (options.context.errors.ccu) { - errorMessage += '\nccu: ' + options.context.errors.ccu; + errorMessage += `\nccu: ${options.context.errors.ccu}`; try { const formatPass = options.ccu.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.ccu && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -148,7 +148,7 @@ function command(options, log, callback) { } } if (options.context.errors.ftp) { - errorMessage += '\nftp: ' + options.context.errors.ftp; + errorMessage += `\nftp: ${options.context.errors.ftp}`; try { const formatPass = options.ftp.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.ftp && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -157,7 +157,7 @@ function command(options, log, callback) { } } if (options.context.errors.dropbox) { - errorMessage += '\ndropbox: ' + options.context.errors.dropbox; + errorMessage += `\ndropbox: ${options.context.errors.dropbox}`; try { const formatPass = options.dropbox.accessToken.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.dropbox && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -166,7 +166,7 @@ function command(options, log, callback) { } } if (options.context.errors.onedrive) { - errorMessage += '\nonedrive: ' + options.context.errors.onedrive; + errorMessage += `\nonedrive: ${options.context.errors.onedrive}`; try { const formatPass = options.onedrive.onedriveAccessJson.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.onedrive && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -175,7 +175,7 @@ function command(options, log, callback) { } } if (options.context.errors.googledrive) { - errorMessage += '\ngoogledrive: ' + options.context.errors.googledrive; + errorMessage += `\ngoogledrive: ${options.context.errors.googledrive}`; try { const formatPass = options.googledrive.accessJson.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.googledrive && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -185,7 +185,7 @@ function command(options, log, callback) { } if (options.context.errors.cifs) { - errorMessage += '\ncifs: ' + options.context.errors.cifs; + errorMessage += `\ncifs: ${options.context.errors.cifs}`; try { const formatPass = options.cifs.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.cifs && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -194,7 +194,7 @@ function command(options, log, callback) { } } if (options.context.errors.umount) { - errorMessage += '\numount: ' + options.context.errors.umount; + errorMessage += `\numount: ${options.context.errors.umount}`; try { const formatPass = options.cifs.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.cifs && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); diff --git a/lib/scripts/96-matrix.js b/lib/scripts/96-matrix.js index 7d4f28f4..7184eee6 100644 --- a/lib/scripts/96-matrix.js +++ b/lib/scripts/96-matrix.js @@ -71,21 +71,21 @@ function command(options, log, callback) { errorMessage += '\n'; - if (options.context.errors.iobroker) errorMessage += '\niobroker: ' + options.context.errors.iobroker; - if (options.context.errors.redis) errorMessage += '\nredis: ' + options.context.errors.redis; - if (options.context.errors.historyDB) errorMessage += '\nhistoryDB: ' + options.context.errors.historyDB; - if (options.context.errors.influxDB) errorMessage += '\ninfluxDB: ' + options.context.errors.influxDB; - if (options.context.errors.sqlite) errorMessage += '\nsqlite: ' + options.context.errors.sqlite; - if (options.context.errors.nodered) errorMessage += '\nnodered: ' + options.context.errors.nodered; - if (options.context.errors.yahka) errorMessage += '\nyahka: ' + options.context.errors.yahka; - if (options.context.errors.zigbee) errorMessage += '\nzigbee: ' + options.context.errors.zigbee; - if (options.context.errors.zigbee2mqtt) errorMessage += '\nzigbee2mqtt: ' + options.context.errors.zigbee2mqtt; - if (options.context.errors.javascripts) errorMessage += '\njavascripts: ' + options.context.errors.javascripts; - if (options.context.errors.jarvis) errorMessage += '\njarvis: ' + options.context.errors.jarvis; - if (options.context.errors.clean) errorMessage += '\nclean: ' + options.context.errors.clean; + if (options.context.errors.iobroker) errorMessage += `\niobroker: ${options.context.errors.iobroker}`; + if (options.context.errors.redis) errorMessage += `\nredis: ${options.context.errors.redis}`; + if (options.context.errors.historyDB) errorMessage += `\nhistoryDB: ${options.context.errors.historyDB}`; + if (options.context.errors.influxDB) errorMessage += `\ninfluxDB: ${options.context.errors.influxDB}`; + if (options.context.errors.sqlite) errorMessage += `\nsqlite: ${options.context.errors.sqlite}`; + if (options.context.errors.nodered) errorMessage += `\nnodered: ${options.context.errors.nodered}`; + if (options.context.errors.yahka) errorMessage += `\nyahka: ${options.context.errors.yahka}`; + if (options.context.errors.zigbee) errorMessage += `\nzigbee: ${options.context.errors.zigbee}`; + if (options.context.errors.zigbee2mqtt) errorMessage += `\nzigbee2mqtt: ${options.context.errors.zigbee2mqtt}`; + if (options.context.errors.javascripts) errorMessage += `\njavascripts: ${options.context.errors.javascripts}`; + if (options.context.errors.jarvis) errorMessage += `\njarvis: ${options.context.errors.jarvis}`; + if (options.context.errors.clean) errorMessage += `\nclean: ${options.context.errors.clean}`; if (options.context.errors.mount) { - errorMessage += '\nmount: ' + options.context.errors.mount; + errorMessage += `\nmount: ${options.context.errors.mount}`; try { const formatPass = options.cifs.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.cifs && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -94,7 +94,7 @@ function command(options, log, callback) { } } if (options.context.errors.mysql) { - errorMessage += '\nmysql: ' + options.context.errors.mysql; + errorMessage += `\nmysql: ${options.context.errors.mysql}`; try { const formatPass = options.mysql.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.mysql && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -103,7 +103,7 @@ function command(options, log, callback) { } } if (options.context.errors.grafana) { - errorMessage += '\ngrafana: ' + options.context.errors.grafana; + errorMessage += `\ngrafana: ${options.context.errors.grafana}`; try { const formatPass = options.grafana.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.grafana && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -116,7 +116,7 @@ function command(options, log, callback) { } if (options.context.errors.webdav) { - errorMessage += '\nwebdav: ' + options.context.errors.webdav; + errorMessage += `\nwebdav: ${options.context.errors.webdav}`; try { const formatPass = options.webdav.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.webdav && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -125,7 +125,7 @@ function command(options, log, callback) { } } if (options.context.errors.pgsql) { - errorMessage += '\npgsql: ' + options.context.errors.pgsql; + errorMessage += `\npgsql: ${options.context.errors.pgsql}`; try { const formatPass = options.pgsql.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.pgsql && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -134,7 +134,7 @@ function command(options, log, callback) { } } if (options.context.errors.ccu) { - errorMessage += '\nccu: ' + options.context.errors.ccu; + errorMessage += `\nccu: ${options.context.errors.ccu}`; try { const formatPass = options.ccu.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.ccu && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -143,7 +143,7 @@ function command(options, log, callback) { } } if (options.context.errors.ftp) { - errorMessage += '\nftp: ' + options.context.errors.ftp; + errorMessage += `\nftp: ${options.context.errors.ftp}`; try { const formatPass = options.ftp.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.ftp && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -152,7 +152,7 @@ function command(options, log, callback) { } } if (options.context.errors.dropbox) { - errorMessage += '\ndropbox: ' + options.context.errors.dropbox; + errorMessage += `\ndropbox: ${options.context.errors.dropbox}`; try { const formatPass = options.dropbox.accessToken.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.dropbox && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -161,7 +161,7 @@ function command(options, log, callback) { } } if (options.context.errors.onedrive) { - errorMessage += '\nonedrive: ' + options.context.errors.onedrive; + errorMessage += `\nonedrive: ${options.context.errors.onedrive}`; try { const formatPass = options.onedrive.onedriveAccessJson.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.onedrive && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -170,7 +170,7 @@ function command(options, log, callback) { } } if (options.context.errors.googledrive) { - errorMessage += '\ngoogledrive: ' + options.context.errors.googledrive; + errorMessage += `\ngoogledrive: ${options.context.errors.googledrive}`; try { const formatPass = options.googledrive.accessJson.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.googledrive && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -180,7 +180,7 @@ function command(options, log, callback) { } if (options.context.errors.cifs) { - errorMessage += '\ncifs: ' + options.context.errors.cifs; + errorMessage += `\ncifs: ${options.context.errors.cifs}`; try { const formatPass = options.cifs.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.cifs && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -189,7 +189,7 @@ function command(options, log, callback) { } } if (options.context.errors.umount) { - errorMessage += '\numount: ' + options.context.errors.umount; + errorMessage += `\numount: ${options.context.errors.umount}`; try { const formatPass = options.cifs.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.cifs && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); diff --git a/lib/scripts/96-pushover.js b/lib/scripts/96-pushover.js index 24d33f5b..4dece018 100644 --- a/lib/scripts/96-pushover.js +++ b/lib/scripts/96-pushover.js @@ -65,9 +65,9 @@ function command(options, log, callback) { if (options.pushover.onlyError === false || options.pushover.onlyError === 'false') { if (options.pushover.SilentNotice === 'true' || options.pushover.SilentNotice === true) { - options.adapter.sendTo(options.pushover.instance, 'send', { message: 'Backitup:\n' + messageText, sound: '', priority: -1, title: 'Backitup', device: options.pushover.deviceID, html: 1 }); + options.adapter.sendTo(options.pushover.instance, 'send', { message: `Backitup:\n${messageText}`, sound: '', priority: -1, title: 'Backitup', device: options.pushover.deviceID, html: 1 }); } else { - options.adapter.sendTo(options.pushover.instance, 'send', { message: 'Backitup:\n' + messageText, sound: '', title: 'Backitup', device: options.pushover.deviceID, html: 1 }); + options.adapter.sendTo(options.pushover.instance, 'send', { message: `Backitup:\n${messageText}`, sound: '', title: 'Backitup', device: options.pushover.deviceID, html: 1 }); } } } else { @@ -75,21 +75,21 @@ function command(options, log, callback) { errorMessage += '\n'; - if (options.context.errors.iobroker) errorMessage += '\niobroker: ' + options.context.errors.iobroker; - if (options.context.errors.redis) errorMessage += '\nredis: ' + options.context.errors.redis; - if (options.context.errors.historyDB) errorMessage += '\nhistoryDB: ' + options.context.errors.historyDB; - if (options.context.errors.influxDB) errorMessage += '\ninfluxDB: ' + options.context.errors.influxDB; - if (options.context.errors.sqlite) errorMessage += '\nsqlite: ' + options.context.errors.sqlite; - if (options.context.errors.nodered) errorMessage += '\nnodered: ' + options.context.errors.nodered; - if (options.context.errors.yahka) errorMessage += '\nyahka: ' + options.context.errors.yahka; - if (options.context.errors.zigbee) errorMessage += '\nzigbee: ' + options.context.errors.zigbee; - if (options.context.errors.zigbee2mqtt) errorMessage += '\nzigbee2mqtt: ' + options.context.errors.zigbee2mqtt; - if (options.context.errors.javascripts) errorMessage += '\njavascripts: ' + options.context.errors.javascripts; - if (options.context.errors.jarvis) errorMessage += '\njarvis: ' + options.context.errors.jarvis; - if (options.context.errors.clean) errorMessage += '\nclean: ' + options.context.errors.clean; + if (options.context.errors.iobroker) errorMessage += `\niobroker: ${options.context.errors.iobroker}`; + if (options.context.errors.redis) errorMessage += `\nredis: ${options.context.errors.redis}`; + if (options.context.errors.historyDB) errorMessage += `\nhistoryDB: ${options.context.errors.historyDB}`; + if (options.context.errors.influxDB) errorMessage += `\ninfluxDB: ${options.context.errors.influxDB}`; + if (options.context.errors.sqlite) errorMessage += `\nsqlite: ${options.context.errors.sqlite}`; + if (options.context.errors.nodered) errorMessage += `\nnodered: ${options.context.errors.nodered}`; + if (options.context.errors.yahka) errorMessage += `\nyahka: ${options.context.errors.yahka}`; + if (options.context.errors.zigbee) errorMessage += `\nzigbee: ${options.context.errors.zigbee}`; + if (options.context.errors.zigbee2mqtt) errorMessage += `\nzigbee2mqtt: ${options.context.errors.zigbee2mqtt}`; + if (options.context.errors.javascripts) errorMessage += `\njavascripts: ${options.context.errors.javascripts}`; + if (options.context.errors.jarvis) errorMessage += `\njarvis: ${options.context.errors.jarvis}`; + if (options.context.errors.clean) errorMessage += `\nclean: ${options.context.errors.clean}`; if (options.context.errors.mount) { - errorMessage += '\nmount: ' + options.context.errors.mount; + errorMessage += `\nmount: ${options.context.errors.mount}`; try { const formatPass = options.cifs.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.cifs && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -98,7 +98,7 @@ function command(options, log, callback) { } } if (options.context.errors.mysql) { - errorMessage += '\nmysql: ' + options.context.errors.mysql; + errorMessage += `\nmysql: ${options.context.errors.mysql}`; try { const formatPass = options.mysql.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.mysql && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -107,7 +107,7 @@ function command(options, log, callback) { } } if (options.context.errors.grafana) { - errorMessage += '\ngrafana: ' + options.context.errors.grafana; + errorMessage += `\ngrafana: ${options.context.errors.grafana}`; try { const formatPass = options.grafana.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.grafana && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -120,7 +120,7 @@ function command(options, log, callback) { } if (options.context.errors.webdav) { - errorMessage += '\nwebdav: ' + options.context.errors.webdav; + errorMessage += `\nwebdav: ${options.context.errors.webdav}`; try { const formatPass = options.webdav.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.webdav && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -129,7 +129,7 @@ function command(options, log, callback) { } } if (options.context.errors.pgsql) { - errorMessage += '\npgsql: ' + options.context.errors.pgsql; + errorMessage += `\npgsql: ${options.context.errors.pgsql}`; try { const formatPass = options.pgsql.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.pgsql && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -138,7 +138,7 @@ function command(options, log, callback) { } } if (options.context.errors.ccu) { - errorMessage += '\nccu: ' + options.context.errors.ccu; + errorMessage += `\nccu: ${options.context.errors.ccu}`; try { const formatPass = options.ccu.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.ccu && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -147,7 +147,7 @@ function command(options, log, callback) { } } if (options.context.errors.ftp) { - errorMessage += '\nftp: ' + options.context.errors.ftp; + errorMessage += `\nftp: ${options.context.errors.ftp}`; try { const formatPass = options.ftp.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.ftp && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -156,7 +156,7 @@ function command(options, log, callback) { } } if (options.context.errors.dropbox) { - errorMessage += '\ndropbox: ' + options.context.errors.dropbox; + errorMessage += `\ndropbox: ${options.context.errors.dropbox}`; try { const formatPass = options.dropbox.accessToken.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.dropbox && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -165,7 +165,7 @@ function command(options, log, callback) { } } if (options.context.errors.onedrive) { - errorMessage += '\nonedrive: ' + options.context.errors.onedrive; + errorMessage += `\nonedrive: ${options.context.errors.onedrive}`; try { const formatPass = options.onedrive.onedriveAccessJson.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.onedrive && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -174,7 +174,7 @@ function command(options, log, callback) { } } if (options.context.errors.googledrive) { - errorMessage += '\ngoogledrive: ' + options.context.errors.googledrive; + errorMessage += `\ngoogledrive: ${options.context.errors.googledrive}`; try { const formatPass = options.googledrive.accessJson.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.googledrive && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -184,7 +184,7 @@ function command(options, log, callback) { } if (options.context.errors.cifs) { - errorMessage += '\ncifs: ' + options.context.errors.cifs; + errorMessage += `\ncifs: ${options.context.errors.cifs}`; try { const formatPass = options.cifs.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.cifs && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -193,7 +193,7 @@ function command(options, log, callback) { } } if (options.context.errors.umount) { - errorMessage += '\numount: ' + options.context.errors.umount; + errorMessage += `\numount: ${options.context.errors.umount}`; try { const formatPass = options.cifs.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.cifs && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -210,9 +210,9 @@ function command(options, log, callback) { */ if (options.pushover.SilentNotice === 'true' || options.pushover.SilentNotice === true) { - options.adapter.sendTo(options.pushover.instance, 'send', { message: 'Backitup:\n' + errorMessage, sound: '', priority: -1, title: 'Backitup', device: options.pushover.deviceID }); + options.adapter.sendTo(options.pushover.instance, 'send', { message: `Backitup:\n${errorMessage}`, sound: '', priority: -1, title: 'Backitup', device: options.pushover.deviceID }); } else { - options.adapter.sendTo(options.pushover.instance, 'send', { message: 'Backitup:\n' + errorMessage, sound: '', title: 'Backitup', device: options.pushover.deviceID }); + options.adapter.sendTo(options.pushover.instance, 'send', { message: `Backitup:\n${errorMessage}`, sound: '', title: 'Backitup', device: options.pushover.deviceID }); } } } diff --git a/lib/scripts/96-signal.js b/lib/scripts/96-signal.js index a3a7f271..463ac318 100644 --- a/lib/scripts/96-signal.js +++ b/lib/scripts/96-signal.js @@ -64,28 +64,28 @@ function command(options, log, callback) { messageText += storageOptions; if (options.signal.onlyError === false || options.signal.onlyError === 'false') { - options.adapter.sendTo(options.signal.instance, 'send', { text: 'Backitup:\n' + messageText }); + options.adapter.sendTo(options.signal.instance, 'send', { text: `Backitup:\n${messageText}` }); } } else { let errorMessage = _('Your backup was not completely created. Please check the errors!!', options.signal.systemLang); errorMessage += '\n'; - if (options.context.errors.iobroker) errorMessage += '\niobroker: ' + options.context.errors.iobroker; - if (options.context.errors.redis) errorMessage += '\nredis: ' + options.context.errors.redis; - if (options.context.errors.historyDB) errorMessage += '\nhistoryDB: ' + options.context.errors.historyDB; - if (options.context.errors.influxDB) errorMessage += '\ninfluxDB: ' + options.context.errors.influxDB; - if (options.context.errors.sqlite) errorMessage += '\nsqlite: ' + options.context.errors.sqlite; - if (options.context.errors.nodered) errorMessage += '\nnodered: ' + options.context.errors.nodered; - if (options.context.errors.yahka) errorMessage += '\nyahka: ' + options.context.errors.yahka; - if (options.context.errors.zigbee) errorMessage += '\nzigbee: ' + options.context.errors.zigbee; - if (options.context.errors.zigbee2mqtt) errorMessage += '\nzigbee2mqtt: ' + options.context.errors.zigbee2mqtt; - if (options.context.errors.javascripts) errorMessage += '\njavascripts: ' + options.context.errors.javascripts; - if (options.context.errors.jarvis) errorMessage += '\njarvis: ' + options.context.errors.jarvis; - if (options.context.errors.clean) errorMessage += '\nclean: ' + options.context.errors.clean; + if (options.context.errors.iobroker) errorMessage += `\niobroker: ${options.context.errors.iobroker}`; + if (options.context.errors.redis) errorMessage += `\nredis: ${options.context.errors.redis}`; + if (options.context.errors.historyDB) errorMessage += `\nhistoryDB: ${options.context.errors.historyDB}`; + if (options.context.errors.influxDB) errorMessage += `\ninfluxDB: ${options.context.errors.influxDB}`; + if (options.context.errors.sqlite) errorMessage += `\nsqlite: ${options.context.errors.sqlite}`; + if (options.context.errors.nodered) errorMessage += `\nnodered: ${options.context.errors.nodered}`; + if (options.context.errors.yahka) errorMessage += `\nyahka: ${options.context.errors.yahka}`; + if (options.context.errors.zigbee) errorMessage += `\nzigbee: ${options.context.errors.zigbee}`; + if (options.context.errors.zigbee2mqtt) errorMessage += `\nzigbee2mqtt: ${options.context.errors.zigbee2mqtt}`; + if (options.context.errors.javascripts) errorMessage += `\njavascripts: ${options.context.errors.javascripts}`; + if (options.context.errors.jarvis) errorMessage += `\njarvis: ${options.context.errors.jarvis}`; + if (options.context.errors.clean) errorMessage += `\nclean: ${options.context.errors.clean}`; if (options.context.errors.mount) { - errorMessage += '\nmount: ' + options.context.errors.mount; + errorMessage += `\nmount: ${options.context.errors.mount}`; try { const formatPass = options.cifs.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.cifs && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -94,7 +94,7 @@ function command(options, log, callback) { } } if (options.context.errors.mysql) { - errorMessage += '\nmysql: ' + options.context.errors.mysql; + errorMessage += `\nmysql: ${options.context.errors.mysql}`; try { const formatPass = options.mysql.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.mysql && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -103,7 +103,7 @@ function command(options, log, callback) { } } if (options.context.errors.grafana) { - errorMessage += '\ngrafana: ' + options.context.errors.grafana; + errorMessage += `\ngrafana: ${options.context.errors.grafana}`; try { const formatPass = options.grafana.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.grafana && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -116,7 +116,7 @@ function command(options, log, callback) { } if (options.context.errors.webdav) { - errorMessage += '\nwebdav: ' + options.context.errors.webdav; + errorMessage += `\nwebdav: ${options.context.errors.webdav}`; try { const formatPass = options.webdav.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.webdav && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -125,7 +125,7 @@ function command(options, log, callback) { } } if (options.context.errors.pgsql) { - errorMessage += '\npgsql: ' + options.context.errors.pgsql; + errorMessage += `\npgsql: ${options.context.errors.pgsql}`; try { const formatPass = options.pgsql.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.pgsql && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -134,7 +134,7 @@ function command(options, log, callback) { } } if (options.context.errors.ccu) { - errorMessage += '\nccu: ' + options.context.errors.ccu; + errorMessage += `\nccu: ${options.context.errors.ccu}`; try { const formatPass = options.ccu.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.ccu && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -143,7 +143,7 @@ function command(options, log, callback) { } } if (options.context.errors.ftp) { - errorMessage += '\nftp: ' + options.context.errors.ftp; + errorMessage += `\nftp: ${options.context.errors.ftp}`; try { const formatPass = options.ftp.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.ftp && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -152,7 +152,7 @@ function command(options, log, callback) { } } if (options.context.errors.dropbox) { - errorMessage += '\ndropbox: ' + options.context.errors.dropbox; + errorMessage += `\ndropbox: ${options.context.errors.dropbox}`; try { const formatPass = options.dropbox.accessToken.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.dropbox && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -161,7 +161,7 @@ function command(options, log, callback) { } } if (options.context.errors.onedrive) { - errorMessage += '\nonedrive: ' + options.context.errors.onedrive; + errorMessage += `\nonedrive: ${options.context.errors.onedrive}`; try { const formatPass = options.onedrive.onedriveAccessJson.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.onedrive && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -170,7 +170,7 @@ function command(options, log, callback) { } } if (options.context.errors.googledrive) { - errorMessage += '\ngoogledrive: ' + options.context.errors.googledrive; + errorMessage += `\ngoogledrive: ${options.context.errors.googledrive}`; try { const formatPass = options.googledrive.accessJson.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.googledrive && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -180,7 +180,7 @@ function command(options, log, callback) { } if (options.context.errors.cifs) { - errorMessage += '\ncifs: ' + options.context.errors.cifs; + errorMessage += `\ncifs: ${options.context.errors.cifs}`; try { const formatPass = options.cifs.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.cifs && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -189,7 +189,7 @@ function command(options, log, callback) { } } if (options.context.errors.umount) { - errorMessage += '\numount: ' + options.context.errors.umount; + errorMessage += `\numount: ${options.context.errors.umount}`; try { const formatPass = options.cifs.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.cifs && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -205,7 +205,7 @@ function command(options, log, callback) { } */ - options.adapter.sendTo(options.signal.instance, 'send', { text: 'Backitup:\n' + errorMessage }); + options.adapter.sendTo(options.signal.instance, 'send', { text: `Backitup:\n${errorMessage}` }); } } callback && callback(); diff --git a/lib/scripts/96-telegram.js b/lib/scripts/96-telegram.js index 1df57a2b..31ebeb18 100644 --- a/lib/scripts/96-telegram.js +++ b/lib/scripts/96-telegram.js @@ -66,9 +66,9 @@ function command(options, log, callback) { if (options.telegram.onlyError === false || options.telegram.onlyError === 'false') { if (options.telegram.User && options.telegram.User === 'allTelegramUsers') { - options.adapter.sendTo(options.telegram.instance, 'send', { text: 'Backitup:\n' + messageText, disable_notification: options.telegram.SilentNotice, parse_mode: 'HTML' }); + options.adapter.sendTo(options.telegram.instance, 'send', { text: `Backitup:\n${messageText}`, disable_notification: options.telegram.SilentNotice, parse_mode: 'HTML' }); } else { - options.adapter.sendTo(options.telegram.instance, 'send', { user: options.telegram.User, text: 'Backitup:\n' + messageText, disable_notification: options.telegram.SilentNotice, parse_mode: 'HTML' }); + options.adapter.sendTo(options.telegram.instance, 'send', { user: options.telegram.User, text: `Backitup:\n${messageText}`, disable_notification: options.telegram.SilentNotice, parse_mode: 'HTML' }); } } } else { @@ -76,21 +76,21 @@ function command(options, log, callback) { errorMessage += '\n'; - if (options.context.errors.iobroker) errorMessage += '\niobroker: ' + options.context.errors.iobroker; - if (options.context.errors.redis) errorMessage += '\nredis: ' + options.context.errors.redis; - if (options.context.errors.historyDB) errorMessage += '\nhistoryDB: ' + options.context.errors.historyDB; - if (options.context.errors.influxDB) errorMessage += '\ninfluxDB: ' + options.context.errors.influxDB; - if (options.context.errors.sqlite) errorMessage += '\nsqlite: ' + options.context.errors.sqlite; - if (options.context.errors.nodered) errorMessage += '\nnodered: ' + options.context.errors.nodered; - if (options.context.errors.yahka) errorMessage += '\nyahka: ' + options.context.errors.yahka; - if (options.context.errors.zigbee) errorMessage += '\nzigbee: ' + options.context.errors.zigbee; - if (options.context.errors.zigbee2mqtt) errorMessage += '\nzigbee2mqtt: ' + options.context.errors.zigbee2mqtt; - if (options.context.errors.javascripts) errorMessage += '\njavascripts: ' + options.context.errors.javascripts; - if (options.context.errors.jarvis) errorMessage += '\njarvis: ' + options.context.errors.jarvis; - if (options.context.errors.clean) errorMessage += '\nclean: ' + options.context.errors.clean; + if (options.context.errors.iobroker) errorMessage += `\niobroker: ${options.context.errors.iobroker}`; + if (options.context.errors.redis) errorMessage += `\nredis: ${options.context.errors.redis}`; + if (options.context.errors.historyDB) errorMessage += `\nhistoryDB: ${options.context.errors.historyDB}`; + if (options.context.errors.influxDB) errorMessage += `\ninfluxDB: ${options.context.errors.influxDB}`; + if (options.context.errors.sqlite) errorMessage += `\nsqlite: ${options.context.errors.sqlite}`; + if (options.context.errors.nodered) errorMessage += `\nnodered: ${options.context.errors.nodered}`; + if (options.context.errors.yahka) errorMessage += `\nyahka: ${options.context.errors.yahka}`; + if (options.context.errors.zigbee) errorMessage += `\nzigbee: ${options.context.errors.zigbee}`; + if (options.context.errors.zigbee2mqtt) errorMessage += `\nzigbee2mqtt: ${options.context.errors.zigbee2mqtt}`; + if (options.context.errors.javascripts) errorMessage += `\njavascripts: ${options.context.errors.javascripts}`; + if (options.context.errors.jarvis) errorMessage += `\njarvis: ${options.context.errors.jarvis}`; + if (options.context.errors.clean) errorMessage += `\nclean: ${options.context.errors.clean}`; if (options.context.errors.mount) { - errorMessage += '\nmount: ' + options.context.errors.mount; + errorMessage += `\nmount: ${options.context.errors.mount}`; try { const formatPass = options.cifs.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.cifs && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -99,7 +99,7 @@ function command(options, log, callback) { } } if (options.context.errors.mysql) { - errorMessage += '\nmysql: ' + options.context.errors.mysql; + errorMessage += `\nmysql: ${options.context.errors.mysql}`; try { const formatPass = options.mysql.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.mysql && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -108,7 +108,7 @@ function command(options, log, callback) { } } if (options.context.errors.grafana) { - errorMessage += '\ngrafana: ' + options.context.errors.grafana; + errorMessage += `\ngrafana: ${options.context.errors.grafana}`; try { const formatPass = options.grafana.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.grafana && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -121,7 +121,7 @@ function command(options, log, callback) { } if (options.context.errors.webdav) { - errorMessage += '\nwebdav: ' + options.context.errors.webdav; + errorMessage += `\nwebdav: ${options.context.errors.webdav}`; try { const formatPass = options.webdav.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.webdav && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -130,7 +130,7 @@ function command(options, log, callback) { } } if (options.context.errors.pgsql) { - errorMessage += '\npgsql: ' + options.context.errors.pgsql; + errorMessage += `\npgsql: ${options.context.errors.pgsql}`; try { const formatPass = options.pgsql.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.pgsql && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -139,7 +139,7 @@ function command(options, log, callback) { } } if (options.context.errors.ccu) { - errorMessage += '\nccu: ' + options.context.errors.ccu; + errorMessage += `\nccu: ${options.context.errors.ccu}`; try { const formatPass = options.ccu.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.ccu && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -148,7 +148,7 @@ function command(options, log, callback) { } } if (options.context.errors.ftp) { - errorMessage += '\nftp: ' + options.context.errors.ftp; + errorMessage += `\nftp: ${options.context.errors.ftp}`; try { const formatPass = options.ftp.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.ftp && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -157,7 +157,7 @@ function command(options, log, callback) { } } if (options.context.errors.dropbox) { - errorMessage += '\ndropbox: ' + options.context.errors.dropbox; + errorMessage += `\ndropbox: ${options.context.errors.dropbox}`; try { const formatPass = options.dropbox.accessToken.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.dropbox && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -166,7 +166,7 @@ function command(options, log, callback) { } } if (options.context.errors.onedrive) { - errorMessage += '\nonedrive: ' + options.context.errors.onedrive; + errorMessage += `\nonedrive: ${options.context.errors.onedrive}`; try { const formatPass = options.onedrive.onedriveAccessJson.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.onedrive && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -175,7 +175,7 @@ function command(options, log, callback) { } } if (options.context.errors.googledrive) { - errorMessage += '\ngoogledrive: ' + options.context.errors.googledrive; + errorMessage += `\ngoogledrive: ${options.context.errors.googledrive}`; try { const formatPass = options.googledrive.accessJson.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.googledrive && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -185,7 +185,7 @@ function command(options, log, callback) { } if (options.context.errors.cifs) { - errorMessage += '\ncifs: ' + options.context.errors.cifs; + errorMessage += `\ncifs: ${options.context.errors.cifs}`; try { const formatPass = options.cifs.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.cifs && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -194,7 +194,7 @@ function command(options, log, callback) { } } if (options.context.errors.umount) { - errorMessage += '\numount: ' + options.context.errors.umount; + errorMessage += `\numount: ${options.context.errors.umount}`; try { const formatPass = options.cifs.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.cifs && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -211,9 +211,9 @@ function command(options, log, callback) { */ if (options.telegram.User && options.telegram.User === 'allTelegramUsers') { - options.adapter.sendTo(options.telegram.instance, 'send', { text: 'Backitup:\n' + errorMessage, disable_notification: options.telegram.SilentNotice }); + options.adapter.sendTo(options.telegram.instance, 'send', { text: `Backitup:\n${errorMessage}`, disable_notification: options.telegram.SilentNotice }); } else { - options.adapter.sendTo(options.telegram.instance, 'send', { user: options.telegram.User, text: 'Backitup:\n' + errorMessage, disable_notification: options.telegram.SilentNotice }); + options.adapter.sendTo(options.telegram.instance, 'send', { user: options.telegram.User, text: `Backitup:\n${errorMessage}`, disable_notification: options.telegram.SilentNotice }); } } } diff --git a/lib/scripts/96-whatsapp.js b/lib/scripts/96-whatsapp.js index d154f06c..a34f14c5 100644 --- a/lib/scripts/96-whatsapp.js +++ b/lib/scripts/96-whatsapp.js @@ -64,28 +64,28 @@ function command(options, log, callback) { messageText += storageOptions; if (options.whatsapp.onlyError === false || options.whatsapp.onlyError === 'false') { - options.adapter.sendTo(options.whatsapp.instance, 'send', { text: '*Backitup:*\n' + messageText }); + options.adapter.sendTo(options.whatsapp.instance, 'send', { text: `*Backitup:*\n${messageText}` }); } } else { let errorMessage = _('Your backup was not completely created. Please check the errors!!', options.whatsapp.systemLang); errorMessage += '\n'; - if (options.context.errors.iobroker) errorMessage += '\niobroker: ' + options.context.errors.iobroker; - if (options.context.errors.redis) errorMessage += '\nredis: ' + options.context.errors.redis; - if (options.context.errors.historyDB) errorMessage += '\nhistoryDB: ' + options.context.errors.historyDB; - if (options.context.errors.influxDB) errorMessage += '\ninfluxDB: ' + options.context.errors.influxDB; - if (options.context.errors.sqlite) errorMessage += '\nsqlite: ' + options.context.errors.sqlite; - if (options.context.errors.nodered) errorMessage += '\nnodered: ' + options.context.errors.nodered; - if (options.context.errors.yahka) errorMessage += '\nyahka: ' + options.context.errors.yahka; - if (options.context.errors.zigbee) errorMessage += '\nzigbee: ' + options.context.errors.zigbee; - if (options.context.errors.zigbee2mqtt) errorMessage += '\nzigbee2mqtt: ' + options.context.errors.zigbee2mqtt; - if (options.context.errors.javascripts) errorMessage += '\njavascripts: ' + options.context.errors.javascripts; - if (options.context.errors.jarvis) errorMessage += '\njarvis: ' + options.context.errors.jarvis; - if (options.context.errors.clean) errorMessage += '\nclean: ' + options.context.errors.clean; + if (options.context.errors.iobroker) errorMessage += `\niobroker: ${options.context.errors.iobroker}`; + if (options.context.errors.redis) errorMessage += `\nredis: ${options.context.errors.redis}`; + if (options.context.errors.historyDB) errorMessage += `\nhistoryDB: ${options.context.errors.historyDB}`; + if (options.context.errors.influxDB) errorMessage += `\ninfluxDB: ${options.context.errors.influxDB}`; + if (options.context.errors.sqlite) errorMessage += `\nsqlite: ${options.context.errors.sqlite}`; + if (options.context.errors.nodered) errorMessage += `\nnodered: ${options.context.errors.nodered}`; + if (options.context.errors.yahka) errorMessage += `\nyahka: ${options.context.errors.yahka}`; + if (options.context.errors.zigbee) errorMessage += `\nzigbee: ${options.context.errors.zigbee}`; + if (options.context.errors.zigbee2mqtt) errorMessage += `\nzigbee2mqtt: ${options.context.errors.zigbee2mqtt}`; + if (options.context.errors.javascripts) errorMessage += `\njavascripts: ${options.context.errors.javascripts}`; + if (options.context.errors.jarvis) errorMessage += `\njarvis: ${options.context.errors.jarvis}`; + if (options.context.errors.clean) errorMessage += `\nclean: ${options.context.errors.clean}`; if (options.context.errors.mount) { - errorMessage += '\nmount: ' + options.context.errors.mount; + errorMessage += `\nmount: ${options.context.errors.mount}`; try { const formatPass = options.cifs.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.cifs && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -94,7 +94,7 @@ function command(options, log, callback) { } } if (options.context.errors.mysql) { - errorMessage += '\nmysql: ' + options.context.errors.mysql; + errorMessage += `\nmysql: ${options.context.errors.mysql}`; try { const formatPass = options.mysql.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.mysql && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -103,7 +103,7 @@ function command(options, log, callback) { } } if (options.context.errors.grafana) { - errorMessage += '\ngrafana: ' + options.context.errors.grafana; + errorMessage += `\ngrafana: ${options.context.errors.grafana}`; try { const formatPass = options.grafana.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.grafana && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -116,7 +116,7 @@ function command(options, log, callback) { } if (options.context.errors.webdav) { - errorMessage += '\nwebdav: ' + options.context.errors.webdav; + errorMessage += `\nwebdav: ${options.context.errors.webdav}`; try { const formatPass = options.webdav.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.webdav && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -125,7 +125,7 @@ function command(options, log, callback) { } } if (options.context.errors.pgsql) { - errorMessage += '\npgsql: ' + options.context.errors.pgsql; + errorMessage += `\npgsql: ${options.context.errors.pgsql}`; try { const formatPass = options.pgsql.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.pgsql && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -134,7 +134,7 @@ function command(options, log, callback) { } } if (options.context.errors.ccu) { - errorMessage += '\nccu: ' + options.context.errors.ccu; + errorMessage += `\nccu: ${options.context.errors.ccu}`; try { const formatPass = options.ccu.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.ccu && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -143,7 +143,7 @@ function command(options, log, callback) { } } if (options.context.errors.ftp) { - errorMessage += '\nftp: ' + options.context.errors.ftp; + errorMessage += `\nftp: ${options.context.errors.ftp}`; try { const formatPass = options.ftp.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.ftp && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -152,7 +152,7 @@ function command(options, log, callback) { } } if (options.context.errors.dropbox) { - errorMessage += '\ndropbox: ' + options.context.errors.dropbox; + errorMessage += `\ndropbox: ${options.context.errors.dropbox}`; try { const formatPass = options.dropbox.accessToken.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.dropbox && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -161,7 +161,7 @@ function command(options, log, callback) { } } if (options.context.errors.onedrive) { - errorMessage += '\nonedrive: ' + options.context.errors.onedrive; + errorMessage += `\nonedrive: ${options.context.errors.onedrive}`; try { const formatPass = options.onedrive.onedriveAccessJson.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.onedrive && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -170,7 +170,7 @@ function command(options, log, callback) { } } if (options.context.errors.googledrive) { - errorMessage += '\ngoogledrive: ' + options.context.errors.googledrive; + errorMessage += `\ngoogledrive: ${options.context.errors.googledrive}`; try { const formatPass = options.googledrive.accessJson.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.googledrive && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -180,7 +180,7 @@ function command(options, log, callback) { } if (options.context.errors.cifs) { - errorMessage += '\ncifs: ' + options.context.errors.cifs; + errorMessage += `\ncifs: ${options.context.errors.cifs}`; try { const formatPass = options.cifs.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.cifs && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -189,7 +189,7 @@ function command(options, log, callback) { } } if (options.context.errors.umount) { - errorMessage += '\numount: ' + options.context.errors.umount; + errorMessage += `\numount: ${options.context.errors.umount}`; try { const formatPass = options.cifs.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.cifs && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); diff --git a/lib/scripts/99-notification.js b/lib/scripts/99-notification.js index b3bfb039..eb4a8958 100644 --- a/lib/scripts/99-notification.js +++ b/lib/scripts/99-notification.js @@ -11,21 +11,21 @@ function command(options, log, callback) { errorMessage += '\n'; - if (options.context.errors.iobroker) errorMessage += '\niobroker: ' + options.context.errors.iobroker; - if (options.context.errors.redis) errorMessage += '\nredis: ' + options.context.errors.redis; - if (options.context.errors.historyDB) errorMessage += '\nhistoryDB: ' + options.context.errors.historyDB; - if (options.context.errors.influxDB) errorMessage += '\ninfluxDB: ' + options.context.errors.influxDB; - if (options.context.errors.sqlite) errorMessage += '\nsqlite: ' + options.context.errors.sqlite; - if (options.context.errors.nodered) errorMessage += '\nnodered: ' + options.context.errors.nodered; - if (options.context.errors.yahka) errorMessage += '\nyahka: ' + options.context.errors.yahka; - if (options.context.errors.zigbee) errorMessage += '\nzigbee: ' + options.context.errors.zigbee; - if (options.context.errors.zigbee2mqtt) errorMessage += '\nzigbee2mqtt: ' + options.context.errors.zigbee2mqtt; - if (options.context.errors.javascripts) errorMessage += '\njavascripts: ' + options.context.errors.javascripts; - if (options.context.errors.jarvis) errorMessage += '\njarvis: ' + options.context.errors.jarvis; - if (options.context.errors.clean) errorMessage += '\nclean: ' + options.context.errors.clean; + if (options.context.errors.iobroker) errorMessage += `\niobroker: ${options.context.errors.iobroker}`; + if (options.context.errors.redis) errorMessage += `\nredis: ${options.context.errors.redis}`; + if (options.context.errors.historyDB) errorMessage += `\nhistoryDB: ${options.context.errors.historyDB}`; + if (options.context.errors.influxDB) errorMessage += `\ninfluxDB: ${options.context.errors.influxDB}`; + if (options.context.errors.sqlite) errorMessage += `\nsqlite: ${options.context.errors.sqlite}`; + if (options.context.errors.nodered) errorMessage += `\nnodered: ${options.context.errors.nodered}`; + if (options.context.errors.yahka) errorMessage += `\nyahka: ${options.context.errors.yahka}`; + if (options.context.errors.zigbee) errorMessage += `\nzigbee: ${options.context.errors.zigbee}`; + if (options.context.errors.zigbee2mqtt) errorMessage += `\nzigbee2mqtt: ${options.context.errors.zigbee2mqtt}`; + if (options.context.errors.javascripts) errorMessage += `\njavascripts: ${options.context.errors.javascripts}`; + if (options.context.errors.jarvis) errorMessage += `\njarvis: ${options.context.errors.jarvis}`; + if (options.context.errors.clean) errorMessage += `\nclean: ${options.context.errors.clean}`; if (options.context.errors.mount) { - errorMessage += '\nmount: ' + options.context.errors.mount; + errorMessage += `\nmount: ${options.context.errors.mount}`; try { const formatPass = options.cifs.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.cifs && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -34,7 +34,7 @@ function command(options, log, callback) { } } if (options.context.errors.mysql) { - errorMessage += '\nmysql: ' + options.context.errors.mysql; + errorMessage += `\nmysql: ${options.context.errors.mysql}`; try { const formatPass = options.mysql.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.mysql && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -43,7 +43,7 @@ function command(options, log, callback) { } } if (options.context.errors.grafana) { - errorMessage += '\ngrafana: ' + options.context.errors.grafana; + errorMessage += `\ngrafana: ${options.context.errors.grafana}`; try { const formatPass = options.grafana.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.grafana && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -56,7 +56,7 @@ function command(options, log, callback) { } if (options.context.errors.webdav) { - errorMessage += '\nwebdav: ' + options.context.errors.webdav; + errorMessage += `\nwebdav: ${options.context.errors.webdav}`; try { const formatPass = options.webdav.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.webdav && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -65,7 +65,7 @@ function command(options, log, callback) { } } if (options.context.errors.pgsql) { - errorMessage += '\npgsql: ' + options.context.errors.pgsql; + errorMessage += `\npgsql: ${options.context.errors.pgsql}`; try { const formatPass = options.pgsql.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.pgsql && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -74,7 +74,7 @@ function command(options, log, callback) { } } if (options.context.errors.ccu) { - errorMessage += '\nccu: ' + options.context.errors.ccu; + errorMessage += `\nccu: ${options.context.errors.ccu}`; try { const formatPass = options.ccu.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.ccu && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -83,7 +83,7 @@ function command(options, log, callback) { } } if (options.context.errors.ftp) { - errorMessage += '\nftp: ' + options.context.errors.ftp; + errorMessage += `\nftp: ${options.context.errors.ftp}`; try { const formatPass = options.ftp.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.ftp && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -92,7 +92,7 @@ function command(options, log, callback) { } } if (options.context.errors.dropbox) { - errorMessage += '\ndropbox: ' + options.context.errors.dropbox; + errorMessage += `\ndropbox: ${options.context.errors.dropbox}`; try { const formatPass = options.dropbox.accessToken.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.dropbox && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -101,7 +101,7 @@ function command(options, log, callback) { } } if (options.context.errors.onedrive) { - errorMessage += '\nonedrive: ' + options.context.errors.onedrive; + errorMessage += `\nonedrive: ${options.context.errors.onedrive}`; try { const formatPass = options.onedrive.onedriveAccessJson.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.onedrive && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -110,7 +110,7 @@ function command(options, log, callback) { } } if (options.context.errors.googledrive) { - errorMessage += '\ngoogledrive: ' + options.context.errors.googledrive; + errorMessage += `\ngoogledrive: ${options.context.errors.googledrive}`; try { const formatPass = options.googledrive.accessJson.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.googledrive && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -120,7 +120,7 @@ function command(options, log, callback) { } if (options.context.errors.cifs) { - errorMessage += '\ncifs: ' + options.context.errors.cifs; + errorMessage += `\ncifs: ${options.context.errors.cifs}`; try { const formatPass = options.cifs.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.cifs && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage); @@ -129,7 +129,7 @@ function command(options, log, callback) { } } if (options.context.errors.umount) { - errorMessage += '\numount: ' + options.context.errors.umount; + errorMessage += `\numount: ${options.context.errors.umount}`; try { const formatPass = options.cifs.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); errorMessage = (options.cifs && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage);