MyFavMirrors/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2025-01-24 13:13:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed creating relayed devices in WAN mode.

Browse Source
This commit is contained in:
Ylian Saint-Hilaire 2022-04-14 14:30:33 -07:00
parent 5c1ee09605
commit 5707677e4e
3 changed files with 2616 additions and 2611 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
meshuser.js
View File

@ -2325,7 +2325,6 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
}
case 'addlocaldevice':
{
if (args.wanonly == true) return; // This is a WAN-only server, local Intel AMT computers can't be added
if (common.validateString(command.meshid, 1, 1024) == false) break; // Check meshid
if ((command.meshid.split('/').length != 3) || (command.meshid.split('/')[1] != domain.id)) return; // Invalid domain, operation only valid for current domain
if (common.validateString(command.devicename, 1, 256) == false) break; // Check device name

5222
translate/translate.json
View File

File diff suppressed because it is too large Load Diff

4
views/default.handlebars
View File

@ -3988,7 +3988,7 @@
var extra = '';
if (view == 2) { r += '<tr><td colspan=' + colcount + '>'; }
if (meshes[node.meshid] && (meshes[node.meshid].mtype == 1)) { extra = '<span class=devHeaderx>' + ", Intel&reg; AMT only" + '</span>'; }
if (meshes[node.meshid] && (meshes[node.meshid].mtype == 3)) { extra = '<span class=devHeaderx>' + ", Local Devices" + '</span>'; }
if (meshes[node.meshid] && (meshes[node.meshid].mtype == 3)) { if (meshes[node.meshid].relayid) { extra = '<span class=devHeaderx>' + ", Relayed Devices" + '</span>'; } else { extra = '<span class=devHeaderx>' + ", Local Devices" + '</span>'; } }
if ((view == 1) && (current != null)) { if (c == 2) { r += '<td><div style=width:301px></div></td>'; } if (r != '') { r += '</tr></table>'; } }
if (view == 2) { r += '<div>'; }
r += '<div class=DevSt style=width:100%;padding-top:4px><span style=float:right>';
@ -4791,7 +4791,7 @@
r += ' <a href=# style=cursor:pointer;font-size:small title="' + "Add a new computer to this device group by installing the mesh agent." + '" onclick=\'return addAgentToMesh("' + mesh._id + '")\'>' + "Add Agent" + '</a>';
if ((features & 2) == 0) { r += ' <a href=# style=cursor:pointer;font-size:small title="' + "Invite someone to install the mesh agent on this device group." + '" onclick=\'return inviteAgentToMesh("' + mesh._id + '")\'>' + "Invite" + '</a>'; }
}
if ((mesh.mtype == 3) && ((features & 1) == 0)) { // Local device group & if not WAN-Only
if (mesh.mtype == 3) { // Local device group
r += ' <a href=# style=cursor:pointer;font-size:small title="' + "Add device located on the local network." + '" onclick=\'return addLocalDeviceToMesh("' + mesh._id + '")\'>' + "Add Device" + '</a>';
}
//if (mesh.amt && (mesh.amt.type > 2)) { // ACM activation or Full Automatic