diff --git a/public/scripts/meshcentral.js b/public/scripts/meshcentral.js index 57d6893d..00a390e9 100644 --- a/public/scripts/meshcentral.js +++ b/public/scripts/meshcentral.js @@ -23,10 +23,7 @@ var MeshServerCreateControl = function (domain, authCookie) { if (obj.connectstate != 0) return; obj.connectstate = 0; var url = window.location.protocol.replace('http', 'ws') + '//' + window.location.host + domain + 'control.ashx' + (urlargs.key ? ('?key=' + urlargs.key) : ''); - if (obj.authCookie && (obj.authCookie != '')) { - url += '?moreargs=1' - //url += '?auth=' + obj.authCookie; - } + if (obj.authCookie && (obj.authCookie != '')) { url += '?moreargs=1' } obj.socket = new WebSocket(url); obj.socket.onopen = function (e) { obj.connectstate = 1; if (obj.authCookie && (obj.authCookie != '')) { obj.send({ 'action': 'urlargs', 'args': { 'auth': obj.authCookie } }); } } obj.socket.onmessage = obj.xxOnMessage; diff --git a/views/default-mobile.handlebars b/views/default-mobile.handlebars index 87cba1b1..cd373a5c 100644 --- a/views/default-mobile.handlebars +++ b/views/default-mobile.handlebars @@ -1284,7 +1284,7 @@ document.onclick = function (e) { if ((xxdialogMode == 999) && (e.target.id != 'topMenuIcon')) { QV('topMenu', false); xxdialogMode = 0; } } // Connect to the mesh server - meshserver = MeshServerCreateControl(domainUrl, authCookie); + meshserver = MeshServerCreateControl(domainUrl); meshserver.onStateChanged = onStateChanged; meshserver.onMessage = onMessage; meshserver.trace = args.trace; diff --git a/views/default.handlebars b/views/default.handlebars index 8f1eb384..5e5001b3 100644 --- a/views/default.handlebars +++ b/views/default.handlebars @@ -1513,7 +1513,7 @@ setTimeout(function() { mainUpdate(512); }, 200); // Connect to the mesh server - meshserver = MeshServerCreateControl(domainUrl, authCookie); + meshserver = MeshServerCreateControl(domainUrl); meshserver.onStateChanged = onStateChanged; meshserver.onMessage = onMessage; meshserver.trace = args.trace;