Merge branch 'master' of https://github.com/Ylianst/MeshCentral

Ylianst · Jul 5, 2022 · 07aa358 · 07aa358
2 parents e71ebdc + 8047cdc
commit 07aa358
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/translate/translate.json b/translate/translate.json
@@ -28180,6 +28180,7 @@
     {
       "en": "Gateway: {0}",
       "nl": "Gateway: {0}",
+	  "pl": "Brama: {0}",
       "xloc": [
         "default-mobile.handlebars->11->556",
         "default.handlebars->45->1453"
@@ -29326,13 +29327,15 @@
       "de": "HTTP Verbindung",
       "en": "HTTP Connection",
       "nl": "HTTP verbinding",
+	  "pl": "Połączenie HTTP",
       "xloc": [
         "default.handlebars->45->750"
       ]
     },
     {
       "en": "HTTP remote connection port:",
       "nl": "HTTP poort voor externe verbinding:",
+	  "pl": "HTTP zdalny port połączenia:",
       "xloc": [
         "default.handlebars->45->749"
       ]
@@ -29366,13 +29369,15 @@
       "de": "HTTPS Verbindung",
       "en": "HTTPS Connection",
       "nl": "HTTPS verbinding",
+	  "pl": "Połączenie HTTPS",
       "xloc": [
         "default.handlebars->45->752"
       ]
     },
     {
       "en": "HTTPS remote connection port:",
       "nl": "HTTPS poort voor externe verbinding:",
+	  "pl": "HTTPS zdalny port połączenia:",
       "xloc": [
         "default.handlebars->45->751"
       ]
@@ -39186,6 +39191,7 @@
     {
       "en": "Mask: {0}",
       "nl": "Mask: {0}",
+	  "pl": "Maska: {0}",
       "xloc": [
         "default-mobile.handlebars->11->555",
         "default.handlebars->45->1452"

diff --git a/webserver.js b/webserver.js
@@ -2972,8 +2972,8 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
         if (domain.devicesearchbarserverandclientname) { features2 += 0x00008000; } // Search bar will find both server name and client name
         if (domain.ipkvm) { features2 += 0x00010000; } // Indicates support for IP KVM device groups
         if ((domain.passwordrequirements) && (domain.passwordrequirements.otp2factor == false)) { features2 += 0x00020000; } // Indicates support for OTP 2FA is disabled
-        if ((typeof domain.passwordrequirements != 'object') || (domain.passwordrequirements.backupcode2factor === false)) { features2 += 0x00040000; } // Indicates 2FA backup codes are disabled
-        if ((typeof domain.passwordrequirements != 'object') || (domain.passwordrequirements.single2factorwarning === false)) { features2 += 0x00080000; } // Indicates no warning if a single 2FA is in use
+        if ((typeof domain.passwordrequirements == 'object') && (domain.passwordrequirements.backupcode2factor === false)) { features2 += 0x00040000; } // Indicates 2FA backup codes are disabled
+        if ((typeof domain.passwordrequirements == 'object') && (domain.passwordrequirements.single2factorwarning === false)) { features2 += 0x00080000; } // Indicates no warning if a single 2FA is in use
         if (domain.nightmode === 1) { features2 += 0x00100000; } // Always night mode
         if (domain.nightmode === 2) { features2 += 0x00200000; } // Always day mode
         if (domain.allowsavingdevicecredentials == false) { features2 += 0x00400000; } // Do not allow device credentials to be saved on the server