From 6633870cc95baa662b4224e6c141a8fce196b1be Mon Sep 17 00:00:00 2001 From: Ylian Saint-Hilaire Date: Wed, 22 Apr 2020 22:15:51 -0700 Subject: [PATCH] Clean up. --- meshcentral.js | 5 +---- meshsms.js | 2 +- package.json | 3 +++ translate/translate.json | 4 ++++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/meshcentral.js b/meshcentral.js index ae8a3a7d..a243c5f3 100644 --- a/meshcentral.js +++ b/meshcentral.js @@ -1327,10 +1327,7 @@ function CreateMeshCentralServer(config, args) { // Setup SMS gateway if (config.sms != null) { obj.smsserver = require('./meshsms.js').CreateMeshSMS(obj); - if (obj.smsserver != null) { - //obj.smsserver.verify(); - if (obj.args.lanonly == true) { addServerWarning("SMS gateway has limited use in LAN mode."); } - } + if ((obj.smsserver != null) && (obj.args.lanonly == true)) { addServerWarning("SMS gateway has limited use in LAN mode."); } } // Start periodic maintenance diff --git a/meshsms.js b/meshsms.js index b44419e5..e1900dae 100644 --- a/meshsms.js +++ b/meshsms.js @@ -57,7 +57,7 @@ module.exports.CreateMeshSMS = function (parent) { if (typeof parent.config.sms.token != 'string') { console.log('Invalid or missing SMS gateway provider token.'); return null; } if (typeof parent.config.sms.from != 'string') { console.log('Invalid or missing SMS gateway provider from.'); return null; } - // Setup Twilio + // Setup Plivo var plivo = require('plivo'); obj.provider = new plivo.Client(parent.config.sms.id, parent.config.sms.token); break; diff --git a/package.json b/package.json index a86397f3..3a638844 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,10 @@ "express": "^4.17.0", "express-handlebars": "^3.1.0", "express-ws": "^4.0.0", + "html-minifier": "^4.0.0", "ipcheck": "^0.1.0", + "jsdom": "^16.2.2", + "minify-js": "0.0.4", "minimist": "^1.2.0", "multiparty": "^4.2.1", "nedb": "^1.8.0", diff --git a/translate/translate.json b/translate/translate.json index 9c1d9567..3ccd40e7 100644 --- a/translate/translate.json +++ b/translate/translate.json @@ -29746,6 +29746,10 @@ "pt": "✓", "ru": "✓", "xloc": [ + "default-mobile.handlebars->container->page_content->column_l->p3->p3info->1->p3AccountActions->3->manageAuthApp->authAppSetupCheck->0", + "default-mobile.handlebars->container->page_content->column_l->p3->p3info->1->p3AccountActions->3->manageEmail2FA->authEmailSetupCheck->0", + "default-mobile.handlebars->container->page_content->column_l->p3->p3info->1->p3AccountActions->3->manageOtp->authCodesSetupCheck->0", + "default-mobile.handlebars->container->page_content->column_l->p3->p3info->1->p3AccountActions->3->managePhoneNumber1->authPhoneNumberCheck->0", "default.handlebars->container->column_l->p13->p13filetable->p13bigok->0", "default.handlebars->container->column_l->p2->p2info->p2AccountSecurity->3->manageAuthApp->0->authAppSetupCheck->0", "default.handlebars->container->column_l->p2->p2info->p2AccountSecurity->3->manageEmail2FA->0->authEmailSetupCheck->0",