Ylianst/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2024-12-22 21:31:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

SMBIOS is no longer saved by default.

Browse Source
This commit is contained in:
Ylian Saint-Hilaire 2020-09-07 20:35:13 -07:00
parent 897aa1618a
commit 95b68fb2a5
4 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meshagent.js
View File

@ -1165,7 +1165,7 @@ module.exports.CreateMeshAgent = function (parent, db, ws, req, args, domain) {
case 'smbios': case 'smbios':
{ {
// See if we need to save SMBIOS information // See if we need to save SMBIOS information
if (domain.smbios !== false) { if (domain.smbios === true) {
// Store the RAW SMBios table of this computer // Store the RAW SMBios table of this computer
// Perform sanity checks before storing // Perform sanity checks before storing
try { try {

4
public/styles/style.css
View File

@ -1220,11 +1220,11 @@ NoMeshesPanel img {
.p10html3right { .p10html3right {
float: right; float: right;
font-size: x-small; font-size: small;
} }
.p10html3left { .p10html3left {
font-size: x-small; font-size: small;
} }
#dp10devicevalue { #dp10devicevalue {

8
translate/translate.json
View File

@ -6652,12 +6652,6 @@
"default.handlebars->27->1214" "default.handlebars->27->1214"
] ]
}, },
{
"tr": "Çince (Traditioneel)",
"zh-chs": "中国传统的",
"zh-cht": "中國傳統的）"
},
{ {
"cs": "ChromeOS", "cs": "ChromeOS",
"de": "ChromeOS", "de": "ChromeOS",
@ -38390,4 +38384,4 @@
] ]
} }
] ]
} }

24
views/default.handlebars
View File

@ -3624,7 +3624,7 @@
} }
// Add a "Add Device Group" option // Add a "Add Device Group" option
r += '<div style=border-top-style:solid;border-top-width:1px;border-top-color:#DDDDDD;cursor:pointer;font-size:10px>'; r += '<div style=border-top-style:solid;border-top-width:1px;border-top-color:#DDDDDD;cursor:pointer;font-size:small>';
if ((view < 3) && (sort == 0) && (Object.keys(meshes).length > 0) && ((userinfo.siteadmin == 0xFFFFFFFF) || ((userinfo.siteadmin & 64) == 0))) { if ((view < 3) && (sort == 0) && (Object.keys(meshes).length > 0) && ((userinfo.siteadmin == 0xFFFFFFFF) || ((userinfo.siteadmin & 64) == 0))) {
r += '<a href=# onclick="return account_createMesh()" title="' + "Create a new group of devices." + '" style=cursor:pointer>' + "Add Device Group" + '</a>&nbsp'; r += '<a href=# onclick="return account_createMesh()" title="' + "Create a new group of devices." + '" style=cursor:pointer>' + "Add Device Group" + '</a>&nbsp';
} }
@ -3904,22 +3904,22 @@
if ((meshrights & 4) == 0) return ''; if ((meshrights & 4) == 0) return '';
var r = ''; var r = '';
if ((features & 1024) == 0) { // If CIRA is allowed if ((features & 1024) == 0) { // If CIRA is allowed
r += ' <a href=# style=cursor:pointer;font-size:10px title="' + "Add a new Intel&reg; AMT computer that is located on the internet." + '" onclick=\'return addCiraDeviceToMesh("' + mesh._id + '")\'>' + "Add CIRA" + '</a>'; r += ' <a href=# style=cursor:pointer;font-size:small title="' + "Add a new Intel&reg; AMT computer that is located on the internet." + '" onclick=\'return addCiraDeviceToMesh("' + mesh._id + '")\'>' + "Add CIRA" + '</a>';
} }
if (mesh.mtype == 1) { if (mesh.mtype == 1) {
if ((features & 1) == 0) { // If not WAN-Only if ((features & 1) == 0) { // If not WAN-Only
r += ' <a href=# style=cursor:pointer;font-size:10px title="' + "Add a new Intel&reg; AMT computer that is located on the local network." + '" onclick=\'return addDeviceToMesh("' + mesh._id + '")\'>' + "Add Local" + '</a>'; r += ' <a href=# style=cursor:pointer;font-size:small title="' + "Add a new Intel&reg; AMT computer that is located on the local network." + '" onclick=\'return addDeviceToMesh("' + mesh._id + '")\'>' + "Add Local" + '</a>';
r += ' <a href=# style=cursor:pointer;font-size:10px title="' + "Add a new Intel&reg; AMT computer by scanning the local network." + '" onclick=\'return addAmtScanToMesh("' + mesh._id + '")\'>' + "Scan Network" + '</a>'; r += ' <a href=# style=cursor:pointer;font-size:small title="' + "Add a new Intel&reg; AMT computer by scanning the local network." + '" onclick=\'return addAmtScanToMesh("' + mesh._id + '")\'>' + "Scan Network" + '</a>';
} }
if (mesh.amt && (mesh.amt.type == 2)) { // CCM activation if (mesh.amt && (mesh.amt.type == 2)) { // CCM activation
r += ' <a href=# style=cursor:pointer;font-size:10px title="' + "Perform Intel AMT client control mode (CCM) activation." + '" onclick=\'return showCcmActivation("' + mesh._id + '")\'>' + "Activation" + '</a>'; r += ' <a href=# style=cursor:pointer;font-size:small title="' + "Perform Intel AMT client control mode (CCM) activation." + '" onclick=\'return showCcmActivation("' + mesh._id + '")\'>' + "Activation" + '</a>';
} else if (mesh.amt && (mesh.amt.type == 3) && ((features & 0x00100000) != 0)) { // ACM activation } else if (mesh.amt && (mesh.amt.type == 3) && ((features & 0x00100000) != 0)) { // ACM activation
r += ' <a href=# style=cursor:pointer;font-size:10px title="' + "Perform Intel AMT admin control mode (ACM) activation." + '" onclick=\'return showAcmActivation("' + mesh._id + '")\'>' + "Activation" + '</a>'; r += ' <a href=# style=cursor:pointer;font-size:small title="' + "Perform Intel AMT admin control mode (ACM) activation." + '" onclick=\'return showAcmActivation("' + mesh._id + '")\'>' + "Activation" + '</a>';
} }
} }
if (mesh.mtype == 2) { if (mesh.mtype == 2) {
r += ' <a href=# style=cursor:pointer;font-size:10px title="' + "Add a new computer to this device group by installing the mesh agent." + '" onclick=\'return addAgentToMesh("' + mesh._id + '")\'>' + "Add Agent" + '</a>'; 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:10px title="' + "Invite someone to install the mesh agent on this device group." + '" onclick=\'return inviteAgentToMesh("' + mesh._id + '")\'>' + "Invite" + '</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>'; }
} }
return r; return r;
} }
@ -9403,7 +9403,7 @@
x += '</tbody></table>'; x += '</tbody></table>';
// If we are full administrator on this mesh, allow deletion of the mesh // If we are full administrator on this mesh, allow deletion of the mesh
if (meshrights == 0xFFFFFFFF) { x += '<div style=font-size:x-small;text-align:right><span><a href=# onclick=p20showDeleteMeshDialog() style=cursor:pointer>' + "Delete Group" + '</a></span></div>'; } if (meshrights == 0xFFFFFFFF) { x += '<div style=font-size:small;text-align:right><span><a href=# onclick=p20showDeleteMeshDialog() style=cursor:pointer>' + "Delete Group" + '</a></span></div>'; }
QH('p20info', x); QH('p20info', x);
@ -11527,7 +11527,7 @@
x += '</tbody></table>'; x += '</tbody></table>';
if ((userinfo.siteadmin & 256) != 0) { if ((userinfo.siteadmin & 256) != 0) {
x += '<div style=font-size:x-small;text-align:right><span><a href=# onclick=p51showDeleteUserGroupDialog() style=cursor:pointer>' + "Delete User Group" + '</a></span></div>'; x += '<div style=font-size:small;text-align:right><span><a href=# onclick=p51showDeleteUserGroupDialog() style=cursor:pointer>' + "Delete User Group" + '</a></span></div>';
} }
QH('p51group2', x); QH('p51group2', x);
@ -11822,9 +11822,9 @@
var userAdminRights = (((userinfo.siteadmin != null) && (userinfo.siteadmin & 2) && (user.siteadmin != 0xFFFFFFFF)) || (userinfo.siteadmin == 0xFFFFFFFF)); var userAdminRights = (((userinfo.siteadmin != null) && (userinfo.siteadmin & 2) && (user.siteadmin != 0xFFFFFFFF)) || (userinfo.siteadmin == 0xFFFFFFFF));
// Show bottom buttons // Show bottom buttons
x = '<div style=float:right;font-size:x-small>'; x = '<div style=float:right;font-size:small>';
if (userAdminRights) { x += '<a href=# style=cursor:pointer onclick=\'return p30showDeleteUserDialog()\' title="' + "Remove this user" + '">' + "Delete User" + '</a>'; } if (userAdminRights) { x += '<a href=# style=cursor:pointer onclick=\'return p30showDeleteUserDialog()\' title="' + "Remove this user" + '">' + "Delete User" + '</a>'; }
x += '</div><div style=font-size:x-small>'; x += '</div><div style=font-size:small>';
// If user admin rights and not SSPI/LDAP and UserID does not start with ~, show change password // If user admin rights and not SSPI/LDAP and UserID does not start with ~, show change password
if (userAdminRights && ((features & 0x00080000) == 0) && (user._id.split('/')[2][0] != '~')) { x += '<a href=# style=cursor:pointer onclick=\'return p30showUserChangePassDialog(' + multiFactor + ')\' title="' + "Change the password for this user" + '">' + "Change Password" + '</a>'; } if (userAdminRights && ((features & 0x00080000) == 0) && (user._id.split('/')[2][0] != '~')) { x += '<a href=# style=cursor:pointer onclick=\'return p30showUserChangePassDialog(' + multiFactor + ')\' title="' + "Change the password for this user" + '">' + "Change Password" + '</a>'; }
x += '</div><br>' x += '</div><br>'