CIRA disabled fix
Ylian Saint-Hilaire committed
Jun 20, 2018 at 11:07 UTC
2a54ebf9b9fa2c63be371643f70f2f5171b6ce66
5 files changed
+5
-2
MeshCentralServer.njsproj
+1
@@ -40,6 +40,7 @@
40
<Compile Include="agents\modules_meshcore\amt-scanner.js" />
41
<Compile Include="agents\modules_meshcore\amt-xml.js" />
42
<Compile Include="agents\modules_meshcore\smbios.js" />
43
+ <Compile Include="agents\modules_meshcore\user-sessions.js" />
44
<Compile Include="agents\modules_meshcore\wifi-scanner-windows.js" />
45
<Compile Include="agents\modules_meshcore\wifi-scanner.js" />
46
<Compile Include="agents\testsuite.js" />
package.json
+1
-1
@@ -1,6 +1,6 @@
1
{
2
"name": "meshcentral",
3
- "version": "0.1.8-f",
3
+ "version": "0.1.8-g",
4
"keywords": [
5
"Remote Management",
6
"Intel AMT",
views/default-mobile.handlebars
+1
@@ -436,6 +436,7 @@
436
<div style="padding:12px;border-top:1px solid gray;color:black;cursor:pointer" onclick=topMenu(1)>My Account</div>
437
<a href=/logout><div style="padding:12px;border-top:1px solid gray;color:black;cursor:pointer">Logout</div></a>
438
</div>
439
+ <iframe name="fileUploadFrame" style=display:none></iframe>
440
<script>
441
var debugLevel = {{{debuglevel}}};
442
var features = {{{features}}};
views/default.handlebars
+1
-1
@@ -1788,7 +1788,7 @@
1788
function getMeshActions(mesh, meshrights) {
1789
if ((meshrights & 4) == 0) return '';
1790
var r = '';
1791
- if ((features & 2) == 0) { // If not LAN-Only
1791
+ if ((features & 1024) == 0) { // If CIRA is allowed
1792
r += ' <a style=cursor:pointer;font-size:10px title="Add a new Intel® AMT computer that is located on the internet." onclick=addCiraDeviceToMesh(\"' + mesh._id + '\")>Add CIRA</a>';
1793
}
1794
if (mesh.mtype == 1) {
webserver.js
+1
@@ -708,6 +708,7 @@ module.exports.CreateWebServer = function (parent, db, args, secret, certificate
708
if (obj.args.webrtc == true) { features += 128; } // Enable WebRTC (Default false for now)
709
if (obj.args.clickonce !== false) { features += 256; } // Enable ClickOnce (Default true)
710
if (obj.args.allowhighqualitydesktop == true) { features += 512; } // Enable AllowHighQualityDesktop (Default false)
711
+ if (obj.args.lanonly == true || obj.args.mpsport == 0) { features += 1024; } // No CIRA
712
713
// Send the master web application
714
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