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

CIRA disabled fix

Browse Source
This commit is contained in:
Ylian Saint-Hilaire 2018-06-20 11:07:29 -07:00
parent c6c9d90066
commit 2a54ebf9b9
5 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MeshCentralServer.njsproj
View File

@ -40,6 +40,7 @@
<Compile Include="agents\modules_meshcore\amt-scanner.js" /> <Compile Include="agents\modules_meshcore\amt-scanner.js" />
<Compile Include="agents\modules_meshcore\amt-xml.js" /> <Compile Include="agents\modules_meshcore\amt-xml.js" />
<Compile Include="agents\modules_meshcore\smbios.js" /> <Compile Include="agents\modules_meshcore\smbios.js" />
<Compile Include="agents\modules_meshcore\user-sessions.js" />
<Compile Include="agents\modules_meshcore\wifi-scanner-windows.js" /> <Compile Include="agents\modules_meshcore\wifi-scanner-windows.js" />
<Compile Include="agents\modules_meshcore\wifi-scanner.js" /> <Compile Include="agents\modules_meshcore\wifi-scanner.js" />
<Compile Include="agents\testsuite.js" /> <Compile Include="agents\testsuite.js" />

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "meshcentral", "name": "meshcentral",
"version": "0.1.8-f", "version": "0.1.8-g",
"keywords": [ "keywords": [
"Remote Management", "Remote Management",
"Intel AMT", "Intel AMT",

1
views/default-mobile.handlebars
View File

@ -436,6 +436,7 @@
<div style="padding:12px;border-top:1px solid gray;color:black;cursor:pointer" onclick=topMenu(1)>My Account</div> <div style="padding:12px;border-top:1px solid gray;color:black;cursor:pointer" onclick=topMenu(1)>My Account</div>
<a href=/logout><div style="padding:12px;border-top:1px solid gray;color:black;cursor:pointer">Logout</div></a> <a href=/logout><div style="padding:12px;border-top:1px solid gray;color:black;cursor:pointer">Logout</div></a>
</div> </div>
<iframe name="fileUploadFrame" style=display:none></iframe>
<script> <script>
var debugLevel = {{{debuglevel}}}; var debugLevel = {{{debuglevel}}};
var features = {{{features}}}; var features = {{{features}}};

2
views/default.handlebars
View File

@ -1788,7 +1788,7 @@
function getMeshActions(mesh, meshrights) { function getMeshActions(mesh, meshrights) {
if ((meshrights & 4) == 0) return ''; if ((meshrights & 4) == 0) return '';
var r = ''; var r = '';
if ((features & 2) == 0) { // If not LAN-Only if ((features & 1024) == 0) { // If CIRA is allowed
r += ' <a style=cursor:pointer;font-size:10px title="Add a new Intel&reg; AMT computer that is located on the internet." onclick=addCiraDeviceToMesh(\"' + mesh._id + '\")>Add CIRA</a>'; r += ' <a style=cursor:pointer;font-size:10px title="Add a new Intel&reg; AMT computer that is located on the internet." onclick=addCiraDeviceToMesh(\"' + mesh._id + '\")>Add CIRA</a>';
} }
if (mesh.mtype == 1) { if (mesh.mtype == 1) {

1
webserver.js
View File

@ -708,6 +708,7 @@ module.exports.CreateWebServer = function (parent, db, args, secret, certificate
if (obj.args.webrtc == true) { features += 128; } // Enable WebRTC (Default false for now) if (obj.args.webrtc == true) { features += 128; } // Enable WebRTC (Default false for now)
if (obj.args.clickonce !== false) { features += 256; } // Enable ClickOnce (Default true) if (obj.args.clickonce !== false) { features += 256; } // Enable ClickOnce (Default true)
if (obj.args.allowhighqualitydesktop == true) { features += 512; } // Enable AllowHighQualityDesktop (Default false) if (obj.args.allowhighqualitydesktop == true) { features += 512; } // Enable AllowHighQualityDesktop (Default false)
if (obj.args.lanonly == true || obj.args.mpsport == 0) { features += 1024; } // No CIRA
// Send the master web application // Send the master web application
if ((!obj.args.user) && (obj.args.nousers != true) && (nologout == false)) { logoutcontrol += ' <a href=' + domain.url + 'logout?' + Math.random() + ' style=color:white>Logout</a>'; } // If a default user is in use or no user mode, don't display the logout button if ((!obj.args.user) && (obj.args.nousers != true) && (nologout == false)) { logoutcontrol += ' <a href=' + domain.url + 'logout?' + Math.random() + ' style=color:white>Logout</a>'; } // If a default user is in use or no user mode, don't display the logout button