From 2a54ebf9b9fa2c63be371643f70f2f5171b6ce66 Mon Sep 17 00:00:00 2001
From: Ylian Saint-Hilaire <ysainthilaire@hotmail.com>
Date: Wed, 20 Jun 2018 11:07:29 -0700
Subject: [PATCH] CIRA disabled fix

---
 MeshCentralServer.njsproj       | 1 +
 package.json                    | 2 +-
 views/default-mobile.handlebars | 1 +
 views/default.handlebars        | 2 +-
 webserver.js                    | 1 +
 5 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/MeshCentralServer.njsproj b/MeshCentralServer.njsproj
index b6d11d3e..21542aa6 100644
--- a/MeshCentralServer.njsproj
+++ b/MeshCentralServer.njsproj
@@ -40,6 +40,7 @@
     <Compile Include="agents\modules_meshcore\amt-scanner.js" />
     <Compile Include="agents\modules_meshcore\amt-xml.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.js" />
     <Compile Include="agents\testsuite.js" />
diff --git a/package.json b/package.json
index b3b52b7b..d3cea94b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "meshcentral",
-  "version": "0.1.8-f",
+  "version": "0.1.8-g",
   "keywords": [
     "Remote Management",
     "Intel AMT",
diff --git a/views/default-mobile.handlebars b/views/default-mobile.handlebars
index 34eaaf17..d7869152 100644
--- a/views/default-mobile.handlebars
+++ b/views/default-mobile.handlebars
@@ -436,6 +436,7 @@
         <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>
     </div>
+    <iframe name="fileUploadFrame" style=display:none></iframe>
     <script>
         var debugLevel = {{{debuglevel}}};
         var features = {{{features}}};
diff --git a/views/default.handlebars b/views/default.handlebars
index 886e57a3..2e5e3ab9 100644
--- a/views/default.handlebars
+++ b/views/default.handlebars
@@ -1788,7 +1788,7 @@
         function getMeshActions(mesh, meshrights) {
             if ((meshrights & 4) == 0) return '';
             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>';
             }
             if (mesh.mtype == 1) {
diff --git a/webserver.js b/webserver.js
index a0b1005c..ff619bd8 100644
--- a/webserver.js
+++ b/webserver.js
@@ -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.clickonce !== false) { features += 256; } // Enable ClickOnce (Default true)
             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
             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