diff --git a/agents/meshcore.js b/agents/meshcore.js index 199f9980..6c612ca1 100644 --- a/agents/meshcore.js +++ b/agents/meshcore.js @@ -362,11 +362,13 @@ function createMeshCore(agent) { } // Called when a file changed in the file system + /* function onFileWatcher(a, b) { console.log('onFileWatcher', a, b, this.path); var response = getDirectoryInfo(this.path); if ((response != undefined) && (response != null)) { this.tunnel.s.write(JSON.stringify(response)); } } + */ // Get a formated response for a given directory path function getDirectoryInfo(reqpath) { @@ -447,12 +449,14 @@ function createMeshCore(agent) { if (this.httprequest.protocol == 1) { this.httprequest.process.end(); delete this.httprequest.process; } delete tunnels[this.httprequest.index]; + /* // Close the watcher if required if (this.httprequest.watcher != undefined) { //console.log('Closing watcher: ' + this.httprequest.watcher.path); //this.httprequest.watcher.close(); // TODO: This line causes the agent to crash!!!! delete this.httprequest.watcher; } + */ // If there is a upload or download active on this connection, close the file if (this.httprequest.uploadFile) { fs.closeSync(this.httprequest.uploadFile); this.httprequest.uploadFile = undefined; } @@ -581,6 +585,7 @@ function createMeshCore(agent) { console.log(objToString(cmd, 0, '.')); switch (cmd.action) { case 'ls': { + /* // Close the watcher if required var samepath = ((this.httprequest.watcher != undefined) && (cmd.path == this.httprequest.watcher.path)); if ((this.httprequest.watcher != undefined) && (samepath == false)) { @@ -588,12 +593,14 @@ function createMeshCore(agent) { //this.httprequest.watcher.close(); // TODO: This line causes the agent to crash!!!! delete this.httprequest.watcher; } + */ // Send the folder content to the browser var response = getDirectoryInfo(cmd.path); if (cmd.reqid != undefined) { response.reqid = cmd.reqid; } this.write(JSON.stringify(response)); + /* // Start the directory watcher if ((cmd.path != '') && (samepath == false)) { var watcher = fs.watch(cmd.path, onFileWatcher); @@ -602,6 +609,7 @@ function createMeshCore(agent) { this.httprequest.watcher = watcher; //console.log('Starting watcher: ' + this.httprequest.watcher.path); } + */ break; } case 'mkdir': { @@ -676,7 +684,7 @@ function createMeshCore(agent) { var response = null; switch (cmd) { case 'help': { // Displays available commands - response = 'Available commands: help, info, args, print, type, dbget, dbset, dbcompact, parseuri, httpget, wslist, wsconnect, wssend, wsclose, notify, ls, amt, netinfo, location, power, wakeonlan, scanwifi.'; + response = 'xxxxxxAvailable commands: help, info, args, print, type, dbget, dbset, dbcompact, parseuri, httpget, wslist, wsconnect, wssend, wsclose, notify, ls, amt, netinfo, location, power, wakeonlan, scanwifi.'; break; } case 'notify': { // Send a notification message to the mesh diff --git a/meshcentral.js b/meshcentral.js index 3e637bfe..bbcd956c 100644 --- a/meshcentral.js +++ b/meshcentral.js @@ -72,7 +72,7 @@ function CreateMeshCentralServer() { try { require('./pass').hash('test', function () { }); } catch (e) { console.log('Old version of node, must upgrade.'); return; } // TODO: Not sure if this test works or not. // Check for invalid arguments - var validArguments = ['_', 'notls', 'user', 'port', 'mpsport', 'redirport', 'cert', 'deletedomain', 'deletedefaultdomain', 'showall', 'showusers', 'shownodes', 'showmeshes', 'showevents', 'showpower', 'showiplocations', 'help', 'exactports', 'install', 'uninstall', 'start', 'stop', 'restart', 'debug', 'filespath', 'datapath', 'noagentupdate', 'launch', 'noserverbackup', 'mongodb', 'mongodbcol', 'wanonly', 'lanonly', 'nousers', 'mpsdebug', 'mpspass', 'ciralocalfqdn', 'dbexport', 'dbimport', 'selfupdate', 'tlsoffload', 'userallowedip', 'fastcert', 'swarmport', 'swarmdebug', 'logintoken', 'logintokenkey']; + var validArguments = ['_', 'notls', 'user', 'port', 'mpsport', 'redirport', 'cert', 'deletedomain', 'deletedefaultdomain', 'showall', 'showusers', 'shownodes', 'showmeshes', 'showevents', 'showpower', 'showiplocations', 'help', 'exactports', 'install', 'uninstall', 'start', 'stop', 'restart', 'debug', 'filespath', 'datapath', 'noagentupdate', 'launch', 'noserverbackup', 'mongodb', 'mongodbcol', 'wanonly', 'lanonly', 'nousers', 'mpsdebug', 'mpspass', 'ciralocalfqdn', 'dbexport', 'dbimport', 'selfupdate', 'tlsoffload', 'userallowedip', 'fastcert', 'swarmport', 'swarmdebug', 'logintoken', 'logintokenkey', 'logintokengen', 'logintokengen', 'mailtokengen']; for (var arg in obj.args) { obj.args[arg.toLocaleLowerCase()] = obj.args[arg]; if (validArguments.indexOf(arg.toLocaleLowerCase()) == -1) { console.log('Invalid argument "' + arg + '", use --help.'); return; } } if (obj.args.mongodb == true) { console.log('Must specify: --mongodb [connectionstring] \r\nSee https://docs.mongodb.com/manual/reference/connection-string/ for MongoDB connection string.'); return; } @@ -372,7 +372,7 @@ function CreateMeshCentralServer() { // Load the login cookie encryption key from the database if allowed if ((obj.config) && (obj.config.settings) && (obj.config.settings.loginTokenOk == true)) { obj.db.Get('LoginCookieEncryptionKey', function (err, docs) { - if ((docs.length > 0) && (docs[0].key != null)) { + if ((docs.length > 0) && (docs[0].key != null) && (obj.args.logintokengen == null)) { obj.loginCookieEncryptionKey = Buffer.from(docs[0].key, 'hex'); } else { obj.loginCookieEncryptionKey = obj.generateCookieKey(); obj.db.Set({ _id: 'LoginCookieEncryptionKey', key: obj.loginCookieEncryptionKey.toString('hex'), time: Date.now() }); @@ -456,10 +456,12 @@ function CreateMeshCentralServer() { if (!obj.db) return; obj.debug(3, 'DispatchEvent', ids); - event.type = 'event'; - event.time = Date.now(); - event.ids = ids; - if (!event.nolog) { obj.db.StoreEvent(ids, source, event); } + if (typeof event == 'object') { + event.type = 'event'; + event.time = Date.now(); + event.ids = ids; + if (!event.nolog) { obj.db.StoreEvent(ids, source, event); } + } var targets = []; // List of targets we dispatched the event to, we don't want to dispatch to the same target twice. for (var j in ids) { var id = ids[j]; @@ -472,7 +474,7 @@ function CreateMeshCentralServer() { } } } - if ((fromPeerServer == null) && (obj.multiServer != null) && (event.nopeers != 1)) { obj.multiServer.DispatchEvent(ids, source, event); } + if ((fromPeerServer == null) && (obj.multiServer != null) && ((typeof event != 'object') || (event.nopeers != 1))) { obj.multiServer.DispatchEvent(ids, source, event); } delete targets; } @@ -842,7 +844,7 @@ function CreateMeshCentralServer() { } else { // Load the login cookie encryption key from the database obj.db.Get('LoginCookieEncryptionKey', function (err, docs) { - if ((docs.length > 0) && (docs[0].key != null)) { + if ((docs.length > 0) && (docs[0].key != null) && (obj.args.logintokengen == null)) { // Key is present, use it. obj.loginCookieEncryptionKey = Buffer.from(docs[0].key, 'hex'); func(obj.encodeCookie({ u: userid, a: 3 }, obj.loginCookieEncryptionKey)); @@ -860,7 +862,7 @@ function CreateMeshCentralServer() { obj.showLoginTokenKey = function (func) { // Load the login cookie encryption key from the database obj.db.Get('LoginCookieEncryptionKey', function (err, docs) { - if ((docs.length > 0) && (docs[0].key != null)) { + if ((docs.length > 0) && (docs[0].key != null) && (obj.args.logintokengen == null)) { // Key is present, use it. func(docs[0].key); } else { diff --git a/meshmail.js b/meshmail.js index 57c9e27c..a318be53 100644 --- a/meshmail.js +++ b/meshmail.js @@ -94,7 +94,7 @@ module.exports.CreateMeshMain = function (parent) { // Load the cookie encryption key from the database obj.parent.db.Get('MailCookieEncryptionKey', function (err, docs) { - if ((docs.length > 0) && (docs[0].key != null)) { + if ((docs.length > 0) && (docs[0].key != null) && (obj.parent.mailtokengen == null)) { // Key is present, use it. obj.mailCookieEncryptionKey = Buffer.from(docs[0].key, 'hex'); } else { diff --git a/package.json b/package.json index b3a61d77..aa62f1b4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "meshcentral", - "version": "0.1.0-x", + "version": "0.1.1-c", "keywords": [ "Remote Management", "Intel AMT", diff --git a/public/scripts/ol3-contextmenu.js b/public/scripts/ol3-contextmenu.js index 0cf94043..b1964365 100644 --- a/public/scripts/ol3-contextmenu.js +++ b/public/scripts/ol3-contextmenu.js @@ -5,4 +5,4 @@ * Built: Fri Feb 24 2017 15:11:20 GMT-0300 (BRT) */ !function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):t.ContextMenu=e()}(this,function(){"use strict";var t="ol-ctx-menu",e="-container",n="-separator",i="-submenu",s="-hidden",o="-icon",a="-zoom-in",r="-zoom-out",l="ol-unselectable",c={BEFOREOPEN:"beforeopen",OPEN:"open",CLOSE:"close",ADD_MENU_ENTRY:"add-menu-entry",CONTEXTMENU:"contextmenu",HOVER:"mouseover"},h={container:t+e,separator:t+n,submenu:t+i,hidden:t+s,icon:t+o,zoomIn:t+a,zoomOut:t+r,OL_unselectable:l},u={width:150,scrollAt:4,eventType:c.CONTEXTMENU,defaultItems:!0},d=[{text:"Zoom In",classname:[h.zoomIn,h.icon].join(" "),callback:function(t,e){var n=e.getView();n.animate({zoom:+n.getZoom()+1,duration:700,center:t.coordinate})}},{text:"Zoom Out",classname:[h.zoomOut,h.icon].join(" "),callback:function(t,e){var n=e.getView();n.animate({zoom:+n.getZoom()-1,duration:700,center:t.coordinate})}}],p={isNumeric:function(t){return/^\d+$/.test(t)},classRegex:function(t){return new RegExp("(^|\\s+) "+t+" (\\s+|$)")},addClass:function(t,e,n){var i=this;if(Array.isArray(t))return void t.forEach(function(t){i.addClass(t,e)});for(var s=Array.isArray(e)?e:e.split(/\s+/),o=s.length;o--;)i.hasClass(t,s[o])||i._addClass(t,s[o],n)},_addClass:function(t,e,n){var i=this;t.classList?t.classList.add(e):t.className=(t.className+" "+e).trim(),n&&this.isNumeric(n)&&window.setTimeout(function(){i._removeClass(t,e)},n)},removeClass:function(t,e,n){var i=this;if(Array.isArray(t))return void t.forEach(function(t){i.removeClass(t,e,n)});for(var s=Array.isArray(e)?e:e.split(/\s+/),o=s.length;o--;)i.hasClass(t,s[o])&&i._removeClass(t,s[o],n)},_removeClass:function(t,e,n){var i=this;t.classList?t.classList.remove(e):t.className=t.className.replace(this.classRegex(e)," ").trim(),n&&this.isNumeric(n)&&window.setTimeout(function(){i._addClass(t,e)},n)},hasClass:function(t,e){return t.classList?t.classList.contains(e):this.classRegex(e).test(t.className)},toggleClass:function(t,e){var n=this;return Array.isArray(t)?void t.forEach(function(t){n.toggleClass(t,e)}):void(t.classList?t.classList.toggle(e):this.hasClass(t,e)?this._removeClass(t,e):this._addClass(t,e))},$:function(t){return t="#"===t[0]?t.substr(1,t.length):t,document.getElementById(t)},isElement:function(t){return"HTMLElement"in window?!!t&&t instanceof HTMLElement:!!t&&"object"==typeof t&&1===t.nodeType&&!!t.nodeName},find:function(t,e,n){void 0===e&&(e=window.document);var i=/^(#?[\w-]+|\.[\w-.]+)$/,s=/\./g,o=Array.prototype.slice,a=[];if(i.test(t))switch(t[0]){case"#":a=[this.$(t.substr(1))];break;case".":a=o.call(e.getElementsByClassName(t.substr(1).replace(s," ")));break;default:a=o.call(e.getElementsByTagName(t))}else a=o.call(e.querySelectorAll(t));return n?a:a[0]},offset:function(t){var e=t.getBoundingClientRect(),n=document.documentElement;return{left:e.left+window.pageXOffset-n.clientLeft,top:e.top+window.pageYOffset-n.clientTop,width:t.offsetWidth,height:t.offsetHeight}},getViewportSize:function(){return{w:window.innerWidth||document.documentElement.clientWidth,h:window.innerHeight||document.documentElement.clientHeight}},getAllChildren:function(t,e){return[].slice.call(t.getElementsByTagName(e))},isEmpty:function(t){return!t||0===t.length},emptyArray:function(t){for(;t.length;)t.pop()},removeAllChildren:function(t){for(;t.firstChild;)t.removeChild(t.firstChild)},mergeOptions:function(t,e){var n={};for(var i in t)n[i]=t[i];for(var s in e)n[s]=e[s];return n},createFragment:function(t){var e=document.createDocumentFragment(),n=document.createElement("div");for(n.innerHTML=t;n.firstChild;)e.appendChild(n.firstChild);return e},contains:function(t,e){return!!~e.indexOf(t)},getUniqueId:function(){return"_"+Math.random().toString(36).substr(2,9)},isDefAndNotNull:function(t){return null!=t},assertEqual:function(t,e,n){if(t!==e)throw new Error(n+" mismatch: "+t+" != "+e)},assert:function(t,e){if(void 0===e&&(e="Assertion failed"),!t){if("undefined"!=typeof Error)throw new Error(e);throw e}}},m=function(t){return this.Base=t,this.map=void 0,this.viewport=void 0,this.coordinateClicked=void 0,this.pixelClicked=void 0,this.lineHeight=0,this.items={},this.opened=!1,this.submenu={left:t.options.width-15+"px",lastLeft:""},this.eventHandler=this.handleEvent.bind(this),this};m.prototype.init=function(t){this.map=t,this.viewport=t.getViewport(),this.setListeners(),this.Base.Html.createMenu(),this.lineHeight=this.getItemsLength()>0?this.Base.container.offsetHeight/this.getItemsLength():this.Base.Html.cloneAndGetLineHeight()},m.prototype.getItemsLength=function(){var t=this,e=0;return Object.keys(this.items).forEach(function(n){t.items[n].submenu||t.items[n].separator||e++}),e},m.prototype.getPixelClicked=function(){return this.pixelClicked},m.prototype.getCoordinateClicked=function(){return this.coordinateClicked},m.prototype.positionContainer=function(t){var e=this,n=this.map.getSize(),i=n[0],s=n[1],o=s-t[1],a=i-t[0],r={w:this.Base.container.offsetWidth,h:Math.round(this.lineHeight*this.getItemsLength())},l=p.find("li."+h.submenu+"> div",this.Base.container,!0);a>=r.w?(this.Base.container.style.right="auto",this.Base.container.style.left=t[0]+5+"px"):(this.Base.container.style.left="auto",this.Base.container.style.right="15px"),o>=r.h?(this.Base.container.style.bottom="auto",this.Base.container.style.top=t[1]-10+"px"):(this.Base.container.style.top="auto",this.Base.container.style.bottom=0),p.removeClass(this.Base.container,h.hidden),l.length&&(a<2*r.w?this.submenu.lastLeft="-"+r.w+"px":this.submenu.lastLeft=this.submenu.left,l.forEach(function(t){var n=p.getViewportSize(),i=p.offset(t),s=i.height,a=o-s;a<0&&(a=s-(n.h-i.top),t.style.top="-"+a+"px"),t.style.left=e.submenu.lastLeft}))},m.prototype.openMenu=function(t,e){this.Base.dispatchEvent({type:c.OPEN,pixel:t,coordinate:e}),this.opened=!0,this.positionContainer(t)},m.prototype.closeMenu=function(){this.opened=!1,p.addClass(this.Base.container,h.hidden),this.Base.dispatchEvent({type:c.CLOSE})},m.prototype.setListeners=function(){this.viewport.addEventListener(this.Base.options.eventType,this.eventHandler,!1)},m.prototype.removeListeners=function(){this.viewport.removeEventListener(this.Base.options.eventType,this.eventHandler,!1)},m.prototype.handleEvent=function(t){var e=this;this.coordinateClicked=this.map.getEventCoordinate(t),this.pixelClicked=this.map.getEventPixel(t),this.Base.dispatchEvent({type:c.BEFOREOPEN,pixel:this.pixelClicked,coordinate:this.coordinateClicked}),this.Base.disabled||(this.Base.options.eventType===c.CONTEXTMENU&&(t.stopPropagation(),t.preventDefault()),this.openMenu(this.pixelClicked,this.coordinateClicked),t.target.addEventListener("mousedown",{handleEvent:function(n){e.closeMenu(),t.target.removeEventListener(n.type,this,!1)}},!1))},m.prototype.setItemListener=function(t,e){var n=this;t&&"function"==typeof this.items[e].callback&&!function(i){t.addEventListener("click",function(t){t.preventDefault();var s={coordinate:n.getCoordinateClicked(),data:n.items[e].data||null};n.closeMenu(),i(s,n.map)},!1)}(this.items[e].callback)};var f=function(t){return this.Base=t,this.Base.container=this.container=this.createContainer(),this};f.prototype.createContainer=function(t){var e=document.createElement("div"),n=document.createElement("ul"),i=[h.container,h.OL_unselectable];return t&&i.push(h.hidden),e.className=i.join(" "),e.style.width=parseInt(this.Base.options.width,10)+"px",e.appendChild(n),e},f.prototype.createMenu=function(){var t=[];return"items"in this.Base.options?t=this.Base.options.defaultItems?this.Base.options.items.concat(d):this.Base.options.items:this.Base.options.defaultItems&&(t=d),0!==t.length&&void t.forEach(this.addMenuEntry,this)},f.prototype.addMenuEntry=function(t){var e=this;if(t.items&&Array.isArray(t.items)){t.classname=t.classname||"",p.contains(h.submenu,t.classname)||(t.classname=t.classname.length?" "+h.submenu:h.submenu);var n=this.generateHtmlAndPublish(this.container,t),i=this.createContainer();i.style.left=this.Base.Internal.submenu.lastLeft||this.Base.Internal.submenu.left,n.appendChild(i),t.items.forEach(function(t){e.generateHtmlAndPublish(i,t,!0)})}else this.generateHtmlAndPublish(this.container,t)},f.prototype.generateHtmlAndPublish=function(t,e,n){var i,s,o,a=!1,r=p.getUniqueId();return"string"==typeof e&&"-"===e.trim()?(i=['
  • ',"
    • "].join(""),s=p.createFragment(i),o=[].slice.call(s.childNodes,0)[0],t.firstChild.appendChild(s),a=!0):(e.classname=e.classname||"",i=""+e.text+"",s=p.createFragment(i),o=document.createElement("li"),e.icon&&(""===e.classname?e.classname=h.icon:e.classname.indexOf(h.icon)===-1&&(e.classname+=" "+h.icon),o.setAttribute("style","background-image:url("+e.icon+")")),o.id=r,o.className=e.classname,o.appendChild(s),t.firstChild.appendChild(o)),this.Base.Internal.items[r]={id:r,submenu:n||0,separator:a,callback:e.callback,data:e.data||null},this.Base.Internal.setItemListener(o,r),o},f.prototype.removeMenuEntry=function(t){var e=p.find("#"+t,this.container.firstChild);e&&this.container.firstChild.removeChild(e),delete this.Base.Internal.items[t]},f.prototype.cloneAndGetLineHeight=function(){var t=this.container.cloneNode(),e=p.createFragment("Foo"),n=p.createFragment("Foo"),i=document.createElement("li"),s=document.createElement("li");i.appendChild(e),s.appendChild(n),t.appendChild(i),t.appendChild(s),this.container.parentNode.appendChild(t);var o=t.offsetHeight/2;return this.container.parentNode.removeChild(t),o};var y=function(t){function e(e){void 0===e&&(e={}),p.assert("object"==typeof e,"@param `opt_options` should be object type!"),"default_items"in e&&(u.defaultItems=e.default_items),this.options=p.mergeOptions(u,e),this.disabled=!1,this.Internal=new m(this),this.Html=new f(this),t.call(this,{element:this.container})}return t&&(e.__proto__=t),e.prototype=Object.create(t&&t.prototype),e.prototype.constructor=e,e.prototype.clear=function(){var t=this;Object.keys(this.Internal.items).forEach(function(e){t.Html.removeMenuEntry(e)})},e.prototype.close=function(){this.Internal.closeMenu()},e.prototype.enable=function(){this.disabled=!1},e.prototype.disable=function(){this.disabled=!0},e.prototype.getDefaultItems=function(){return d},e.prototype.extend=function(t){p.assert(Array.isArray(t),"@param `arr` should be an Array."),t.forEach(this.push,this)},e.prototype.isOpened=function(){return this.isOpen()},e.prototype.isOpen=function(){return this.Internal.opened},e.prototype.updatePosition=function(t){p.assert(Array.isArray(t),"@param `pixel` should be an Array."),this.isOpen()&&this.Internal.positionContainer(t)},e.prototype.pop=function(){var t=Object.keys(this.Internal.items);this.Html.removeMenuEntry(t[t.length-1])},e.prototype.push=function(t){p.assert(p.isDefAndNotNull(t),"@param `item` must be informed."),this.Html.addMenuEntry(t)},e.prototype.shift=function(){this.Html.removeMenuEntry(Object.keys(this.Internal.items)[0])},e.prototype.setMap=function(t){ol.control.Control.prototype.setMap.call(this,t),t?this.Internal.init(t,this):this.Internal.removeListeners()},e}(ol.control.Control);return y}); -//# sourceMappingURL=ol3-contextmenu.js.map \ No newline at end of file +///# sourceMappingURL=ol3-contextmenu.js.map \ No newline at end of file diff --git a/views/default.handlebars b/views/default.handlebars index 8cb84f41..74e18503 100644 --- a/views/default.handlebars +++ b/views/default.handlebars @@ -458,8 +458,8 @@
    - - +
    +
    @@ -782,6 +782,7 @@ QV('p2ServerActionsVersion', siteRights & 16); QV('MainMenuMyFiles', siteRights & 8); if (((siteRights & 8) == 0) && (xxcurrentView == 5)) { go(1); } + if (currentNode != null) { gotoDevice(currentNode._id, xxcurrentView, true); } // Update user management state if ((userinfo.siteadmin & 2) != 0) @@ -1264,6 +1265,7 @@ if (!xxdialogMode && xxcurrentView == 11 && desktop && desktop.State == 3) return desktop.m.handleKeyUp(e); if (!xxdialogMode && xxcurrentView == 12 && terminal && terminal.State == 3) return terminal.m.TermHandleKeyUp(e); if (!xxdialogMode && xxcurrentView == 13 && e.keyCode == 116 && p13filetree != null) { p13folderup(9999); haltEvent(e); return false; } // F5 Refresh on files + if (xxdialogMode && e.keyCode == 27) { dialogclose(0); } if (xxdialogMode || xxcurrentView != 0 || e.ctrlKey == true || e.altKey == true || e.metaKey == true) return; if (Q('viewselect').value < 3) { if ((e.keyCode === 8 && searchFocus == 0) || e.keyCode === 27) { return haltEvent(e); } } if (Q('viewselect').value == 3) { if ((e.keyCode === 8 && mapSearchFocus == 0) || e.keyCode === 27) { return haltEvent(e); } } @@ -1432,17 +1434,23 @@ x += addHtmlValue('Security', ''); setDialogMode(2, "Add Intel® AMT device", 3, addDeviceToMeshEx, x, meshid); validateDeviceToMesh(); + Q('dp1devicename').focus(); } // Display the Intel AMT scanning dialog box function addAmtScanToMesh(meshid) { if (xxdialogMode) return; var x = "Enter a range of IP addresses to scan for Intel AMT devices.

    "; - x += addHtmlValue('IP Range', ''); + x += addHtmlValue('IP Range', ''); x += '
    '; setDialogMode(2, "Scan for Intel® AMT devices", 3, addAmtScanToMeshEx, x, meshid); QE('idx_dlgOkButton', false); QH('dp1results', '
    Sample IP range values
    192.168.0.100
    192.168.1.0/24
    192.167.0.1-192.168.0.100
    '); + focusTextBox('dp1range'); + } + + function addAmtScanToMeshKeyUp(e) { + if (e.keyCode == 13) { haltEvent(e); addAmtScanToMeshButton(); } } // Called when OK is pressed on the Intel AMT scanning box @@ -1525,7 +1533,7 @@ var meshidx = meshid.substring(5); if (meshidx[0] == '/') meshidx = meshidx.substring(1); var x = ""; - x += addHtmlValue('Operating System', '') + '
    '; + x += addHtmlValue('Operating System', '') + '
    '; // Windows agent install x += "
    To add a new computer to mesh " + EscapeHtml(mesh.name) + ", download the mesh agent and configuration file and install the agent on the computer to manage.

    "; @@ -1548,7 +1556,7 @@ x += ''; x += "
    "; - setDialogMode(2, "Add Mesh Agent", 1, null, x); + setDialogMode(2, "Add Mesh Agent", 9, null, x); if (serverinfo.https == true) { Q('agins_linux_area').value = "wget -q https://" + serverinfo.name + ":" + serverinfo.port + "/meshagents?script=1 --no-check-certificate -O ./meshinstall.sh && chmod 755 ./meshinstall.sh && sudo ./meshinstall.sh https://" + serverinfo.name + ":" + serverinfo.port + " " + meshid.split('/')[2].replace(/\$/g, '\\$') + "\r\n"; @@ -1557,6 +1565,7 @@ Q('agins_linux_area').value = "wget -q http://" + serverinfo.name + ":" + serverinfo.port + "/meshagents?script=1 -O ./meshinstall.sh && chmod 755 ./meshinstall.sh && sudo ./meshinstall.sh http://" + serverinfo.name + ":" + serverinfo.port + " " + meshid.split('/')[2].replace(/\$/g, '\\$') + "\r\n"; Q('agins_linux_area_un').value = "wget -q http://" + serverinfo.name + ":" + serverinfo.port + "/meshagents?script=1 -O ./meshinstall.sh && chmod 755 ./meshinstall.sh && sudo ./meshinstall.sh uninstall\r\n"; } + Q('aginsSelect').focus(); } function addAgentToMeshClick() { @@ -2513,7 +2522,7 @@ QV('MainDevFiles', (mesh.mtype == 2) && ((node.agent == null) || (node.agent.caps == null) || ((node.agent.caps & 4) != 0))); QV('MainDevAmt', node.intelamt != null); QV('MainDevConsole', consoleRights && (mesh.mtype == 2) && ((node.agent == null) || (node.agent.caps == null) || ((node.agent.caps & 8) != 0))); - QV('p15uploadCore', (node.agent != null) && (node.agent.caps != null) && ((node.agent.caps & 16) != 0)); + QV('p15uploadCore', (node.agent != null) && (node.agent.caps != null) && ((node.agent.caps & 16) != 0) && (userinfo.siteadmin == 0xFFFFFFFF)); QH('p15coreName', ((node.agent != null) && (node.agent.core != null))?node.agent.core:''); // Setup/Refresh Intel AMT tab @@ -2807,12 +2816,13 @@ var showEditNodeValueDialog_modes2 = ['name', 'host', 'desc']; function showEditNodeValueDialog(mode) { if (xxdialogMode) return; - var x = addHtmlValue(showEditNodeValueDialog_modes[mode], ''); + var x = addHtmlValue(showEditNodeValueDialog_modes[mode], ''); setDialogMode(2, "Edit Device", 3, showEditNodeValueDialogEx, x, mode); var v = currentNode[showEditNodeValueDialog_modes2[mode]]; if (v == null) v = ''; Q('dp10devicevalue').value = v; p10editdevicevalueValidate(); + Q('dp10devicevalue').focus(); } function showEditNodeValueDialogEx(button, mode) { @@ -2821,8 +2831,10 @@ meshserver.Send(x); } - function p10editdevicevalueValidate(mode) { - QE('idx_dlgOkButton', (mode > 1) || (Q('dp10devicevalue').value.length > 0)); + function p10editdevicevalueValidate(mode, e) { + var x = ((mode > 1) || (Q('dp10devicevalue').value.length > 0)); + QE('idx_dlgOkButton', x); + if ((e != null) && (x == true) && (e.keyCode == 13)) { dialogclose(1); } } // @@ -3191,6 +3203,7 @@ if (files != null) { files.Stop(); delete files; files = null; } break; case 3: + p13targetpath = ''; files.Send(JSON.stringify({ action: 'ls', reqid: 1, path: '' })); break; } @@ -3224,6 +3237,7 @@ } var p13filetree = null; + var p13targetpath = null; var p13filetreelocation = []; function p13gotFiles(data) { @@ -3235,9 +3249,11 @@ p13filetree = data; p13updateFiles(checkedNames); } else { - // This is a different folder - p13filetree = data; - p13updateFiles(); + if ((data.path.replace(/\//g, "\\") == p13targetpath.replace(/\//g, "\\")) || ((data.path == '\\') && (p13targetpath == ''))) { + // This is a different folder + p13filetree = data; + p13updateFiles(); + } } } @@ -3318,12 +3334,14 @@ } function p13folderset(x) { - files.Send(JSON.stringify({ action: 'ls', reqid: 1, path: joinPaths(p13filetree.path, p13filetree.dir[x].n).split('\\').join('/') })); + p13targetpath = joinPaths(p13filetree.path, p13filetree.dir[x].n).split('\\').join('/'); + files.Send(JSON.stringify({ action: 'ls', reqid: 1, path: p13targetpath })); } function p13folderup(x) { if (x == null) { p13filetreelocation.pop(); } else { while (p13filetreelocation.length > x) { p13filetreelocation.pop(); } } - files.Send(JSON.stringify({ action: 'ls', reqid: 1, path: p13filetreelocation.join('/') })); + p13targetpath = p13filetreelocation.join('/'); + files.Send(JSON.stringify({ action: 'ls', reqid: 1, path: p13targetpath })); } var p13sortorder; @@ -3367,13 +3385,13 @@ function p13getFileSelCount() { var cc = 0; var checkboxes = document.getElementsByName('fd'); for (var i = 0; i < checkboxes.length; i++) { if (checkboxes[i].checked) cc++; } return cc; } function p13getFileCount() { var cc = 0; var checkboxes = document.getElementsByName('fd'); return checkboxes.length; } function p13selectallfile() { var nv = (p13getFileSelCount() == 0), checkboxes = document.getElementsByName('fd'); for (var i = 0; i < checkboxes.length; i++) { checkboxes[i].checked = nv; } p13setActions(); } - function p13createfolder() { setDialogMode(2, "New Folder", 3, p13createfolderEx, ''); Q('p13renameinput').focus(); } - function p13createfolderEx() { files.Send(JSON.stringify({ action: 'mkdir', reqid: 1, path: p13filetreelocation.join('/') + '/' + Q('p13renameinput').value })); } + function p13createfolder() { setDialogMode(2, "New Folder", 3, p13createfolderEx, ''); focusTextBox('p13renameinput'); p13fileNameCheck(); } + function p13createfolderEx() { files.Send(JSON.stringify({ action: 'mkdir', reqid: 1, path: p13filetreelocation.join('/') + '/' + Q('p13renameinput').value })); p13folderup(999); } function p13deletefile() { var cc = getFileSelCount(); setDialogMode(2, "Delete", 3, p13deletefileEx, (cc > 1)?('Delete ' + cc + ' selected items?'):('Delete selected item?')); } - function p13deletefileEx() { var delfiles = [], checkboxes = document.getElementsByName('fd'); for (var i = 0; i < checkboxes.length; i++) { if (checkboxes[i].checked) { delfiles.push(p13filetree.dir[checkboxes[i].value].n); } } files.Send(JSON.stringify({ action: 'rm', reqid: 1, path: p13filetreelocation.join('/'), delfiles: delfiles })); } - function p13renamefile() { var renamefile, checkboxes = document.getElementsByName('fd'); for (var i = 0; i < checkboxes.length; i++) { if (checkboxes[i].checked) { renamefile = p13filetree.dir[checkboxes[i].value].n; } } setDialogMode(2, "Rename", 3, p13renamefileEx, '', { action: 'rename', path: p13filetreelocation.join('/'), oldname: renamefile}); Q('p13renameinput').focus(); } - function p13renamefileEx(b, t) { t.newname = Q('p13renameinput').value; files.Send(JSON.stringify(t)); } - function p13fileNameCheck() { QE('idx_dlgOkButton', isFilenameValid(Q('p13renameinput').value)); } + function p13deletefileEx() { var delfiles = [], checkboxes = document.getElementsByName('fd'); for (var i = 0; i < checkboxes.length; i++) { if (checkboxes[i].checked) { delfiles.push(p13filetree.dir[checkboxes[i].value].n); } } files.Send(JSON.stringify({ action: 'rm', reqid: 1, path: p13filetreelocation.join('/'), delfiles: delfiles })); p13folderup(999); } + function p13renamefile() { var renamefile, checkboxes = document.getElementsByName('fd'); for (var i = 0; i < checkboxes.length; i++) { if (checkboxes[i].checked) { renamefile = p13filetree.dir[checkboxes[i].value].n; } } setDialogMode(2, "Rename", 3, p13renamefileEx, '', { action: 'rename', path: p13filetreelocation.join('/'), oldname: renamefile}); focusTextBox('p13renameinput'); p13fileNameCheck(); } + function p13renamefileEx(b, t) { t.newname = Q('p13renameinput').value; files.Send(JSON.stringify(t)); p13folderup(999); } + function p13fileNameCheck(e) { var x = isFilenameValid(Q('p13renameinput').value); QE('idx_dlgOkButton', x); if ((x == true) && (e.keyCode == 13)) { dialogclose(1); } } function p13uploadFile() { setDialogMode(2, "Upload File", 3, p13uploadFileEx, ''); updateUploadDialogOk('p13uploadinput'); } function p13uploadFileEx() { p13doUploadFiles(Q('p13uploadinput').files); } @@ -3481,6 +3499,7 @@ function onFileUploadStateChange(xdownloadFile, state) { switch (state) { case 0: + p13folderup(9999); break; case 3: p13uploadNextFile(); @@ -3608,8 +3627,6 @@ QE('p15consoleText', false); QE('p15uploadCore', false); } - - QV('p15uploadCore', (userinfo.siteadmin == 0xFFFFFFFF)); } // Clear the console for this node @@ -3718,15 +3735,18 @@ function account_showChangeEmail() { if (xxdialogMode) return; var x = "Change your account e-mail address here.

    "; - x += addHtmlValue('Email', ''); + x += addHtmlValue('Email', ''); setDialogMode(2, "Email Address Change", 3, account_changeEmail, x); if (userinfo.email != null) { Q('dp2email').value = userinfo.email; } account_validateEmail(); + Q('dp2email').focus(); } - function account_validateEmail() { + function account_validateEmail(e) { var x = Q('dp2email').value.split('@'); - QE('idx_dlgOkButton', (x.length == 2) && (x[0].length > 0) && (x[1].split('.').length > 1) && (x[1].length > 2) && (Q('dp2email').value.length < 1024) && (Q('dp2email').value != userinfo.email)); + x = (x.length == 2) && (x[0].length > 0) && (x[1].split('.').length > 1) && (x[1].length > 2) && (Q('dp2email').value.length < 1024) && (Q('dp2email').value != userinfo.email); + QE('idx_dlgOkButton', x); + if ((x == true) && (e != null) && (e.keyCode == 13)) { dialogclose(1); } } function account_changeEmail() { @@ -3746,6 +3766,7 @@ x += '
    '; setDialogMode(2, "Delete Account", 0, null, x); account_validateDeleteAccount(); + Q('apassword1').focus(); } function account_showChangePassword() { @@ -3763,6 +3784,7 @@ x += '
    '; setDialogMode(2, "Change Password", 0, null, x); account_validateDeleteAccount(); + Q('apassword1').focus(); } function account_createMesh() { @@ -3773,6 +3795,7 @@ x += addHtmlValue('Description', '
    '); setDialogMode(2, "Create Mesh", 3, account_createMeshEx, x); account_validateMeshCreate(); + Q('dp2meshname').focus(); } function account_validateMeshCreate() { @@ -3871,8 +3894,8 @@ if (currentMesh.mtype == 2) meshtype = 'Mesh agent computer group'; var x = ''; - x += addHtmlValue('Name', addLinkConditional(EscapeHtml(currentMesh.name), 'p20editmesh()', (meshrights & 1) != 0)); - x += addHtmlValue('Description', addLinkConditional(((currentMesh.desc && currentMesh.desc != '')?EscapeHtml(currentMesh.desc):'None'), 'p20editmesh()', (meshrights & 1) != 0)); + x += addHtmlValue('Name', addLinkConditional(EscapeHtml(currentMesh.name), 'p20editmesh(1)', (meshrights & 1) != 0)); + x += addHtmlValue('Description', addLinkConditional(((currentMesh.desc && currentMesh.desc != '')?EscapeHtml(currentMesh.desc):'None'), 'p20editmesh(2)', (meshrights & 1) != 0)); x += addHtmlValue('Type', meshtype); x += addHtmlValue('Identifier', currentMesh._id.split('/')[2]); @@ -3941,7 +3964,7 @@ meshserver.Send({ action: 'deletemesh', meshid: currentMesh._id, meshname: currentMesh.name }); } - function p20editmesh() { + function p20editmesh(focus) { if (xxdialogMode) return; x = "Create a new mesh computer group using the options below.

    "; x += addHtmlValue('Mesh Name', ''); @@ -3950,6 +3973,7 @@ Q('dp20meshname').value = currentMesh.name; if (currentMesh.desc) Q('dp20meshdesc').value = currentMesh.desc; p20editmeshValidate(); + if (focus == 2) { Q('dp20meshdesc').focus(); } else { Q('dp20meshname').focus(); } } function p20editmeshEx() { @@ -3976,6 +4000,7 @@ x += ''; setDialogMode(2, "Add User to Mesh", 3, p20showAddMeshUserDialogEx, x); p20validateAddMeshUserDialog(); + Q('dp20username').focus(); } function p20validateAddMeshUserDialog() { @@ -4175,13 +4200,13 @@ function getFileSizeStr(size) { if (size == 1) return "1 byte"; return "" + size + " bytes"; } function p5folderup(x) { if (x == null) { filetreelocation.pop(); } else { while (filetreelocation.length > x) { filetreelocation.pop(); } } updateFiles(); } function p5folderset(x) { filetreelocation.push(decodeURIComponent(x)); updateFiles(); } - function p5createfolder() { setDialogMode(2, "New Folder", 3, p5createfolderEx, ''); Q('p5renameinput').focus(); } + function p5createfolder() { setDialogMode(2, "New Folder", 3, p5createfolderEx, ''); focusTextBox('p5renameinput'); p5fileNameCheck(); } function p5createfolderEx() { meshserver.Send({ action: 'fileoperation', fileop: 'createfolder', path: filetreelocation, newfolder: Q('p5renameinput').value}); } function p5deletefile() { var cc = getFileSelCount(); setDialogMode(2, "Delete", 3, p5deletefileEx, (cc > 1)?('Delete ' + cc + ' selected items?'):('Delete selected item?')); } function p5deletefileEx() { var delfiles = [], checkboxes = document.getElementsByName('fc'); for (var i = 0; i < checkboxes.length; i++) { if (checkboxes[i].checked) { delfiles.push(checkboxes[i].value); } } meshserver.Send({ action: 'fileoperation', fileop: 'delete', path: filetreelocation, delfiles: delfiles}); } - function p5renamefile() { var renamefile, checkboxes = document.getElementsByName('fc'); for (var i = 0; i < checkboxes.length; i++) { if (checkboxes[i].checked) { renamefile = checkboxes[i].value; } } setDialogMode(2, "Rename", 3, p5renamefileEx, '', { action: 'fileoperation', fileop: 'rename', path: filetreelocation, oldname: renamefile}); Q('p5renameinput').focus(); } + function p5renamefile() { var renamefile, checkboxes = document.getElementsByName('fc'); for (var i = 0; i < checkboxes.length; i++) { if (checkboxes[i].checked) { renamefile = checkboxes[i].value; } } setDialogMode(2, "Rename", 3, p5renamefileEx, '', { action: 'fileoperation', fileop: 'rename', path: filetreelocation, oldname: renamefile}); focusTextBox('p5renameinput'); p5fileNameCheck(); } function p5renamefileEx(b, t) { t.newname = Q('p5renameinput').value; meshserver.Send(t); } - function p5fileNameCheck() { QE('idx_dlgOkButton', isFilenameValid(Q('p5renameinput').value)); } + function p5fileNameCheck(e) { var x = isFilenameValid(Q('p5renameinput').value); QE('idx_dlgOkButton', x); if ((x == true) && (e.keyCode == 13)) { dialogclose(1); } } var isFilenameValid = (function(){ var x1=/^[^\\/:\*\?"<>\|]+$/, x2=/^\./, x3=/^(nul|prn|con|lpt[0-9]|com[0-9])(\.|$)/i; return function isFilenameValid(fname){ return x1.test(fname)&&!x2.test(fname)&&!x3.test(fname)&&(fname[0] != '.'); } })(); function p5uploadFile() { setDialogMode(2, "Upload File", 3, p5uploadFileEx, '
    '); updateUploadDialogOk('p5uploadinput'); } function p5uploadFileEx() { Q('p5loginSubmit').click(); } @@ -4360,6 +4385,7 @@ x += addHtmlValue('Password', ''); setDialogMode(2, "Create Account", 3, showCreateNewAccountDialogEx, x); showCreateNewAccountDialogValidate(); + Q('p4name').focus(); } function showCreateNewAccountDialogValidate() { @@ -4717,6 +4743,7 @@ function addHtmlValue(t, v) { return '
    ' + t + '' + v + '
    '; } function addHtmlValue2(t, v) { return '
    ' + v + '
    ' + t + '
    '; } function parseUriArgs() { var name, r = {}, parsedUri = window.document.location.href.split(/[\?&|\=]/); parsedUri.splice(0, 1); for (x in parsedUri) { switch (x % 2) { case 0: { name = parsedUri[x]; break; } case 1: { r[name] = parsedUri[x]; var x = parseInt(r[name]); if (x == r[name]) { r[name] = x; } break; } } } return r; } + function focusTextBox(x) { setTimeout(function(){ Q(x).selectionStart = Q(x).selectionEnd = 65535; Q(x).focus(); }, 0); } diff --git a/views/login.handlebars b/views/login.handlebars index 144f8520..cd7dba13 100644 --- a/views/login.handlebars +++ b/views/login.handlebars @@ -42,11 +42,11 @@ - + - + @@ -73,27 +73,27 @@
    Username:
    Password:
    - + - + - + - + - + - +
    Username:
    Email:
    Password:
    Password:
    Password Hint:
    Creation Token:
    @@ -116,7 +116,7 @@ - +
    Email:
    @@ -180,7 +180,7 @@ if ((passhint != null) && (passhint.length > 0)) { QV("showPassHintLink", true); } QV("newAccountPass", (newAccountPass == 1)); QV("resetAccountDiv", (emailCheck == true)); - QV("hrAccountDiv", (emailCheck == true) || (newAccountPass == 1)) + QV("hrAccountDiv", (emailCheck == true) || (newAccountPass == 1)); } function showPassHint() { @@ -199,15 +199,23 @@ QV('loginpanel', x == 1); QV('createpanel', x == 2); QV('resetpanel', x == 3); + if (x == 1) { Q('username').focus(); } + if (x == 2) { Q('ausername').focus(); } + if (x == 3) { Q('remail').focus(); } } - function validateLogin() { + function validateLogin(box, e) { var ok = (Q('username').value.length > 0 && Q('password').value.length > 0); QE('loginButton', ok); setDialogMode(0); + if ((e != null) && (e.keyCode == 13)) { + if (box == 1) { Q('password').focus(); } + if (box == 2) { Q('loginButton').click(); } + } + if (e != null) { haltEvent(e); } } - function validateCreate() { + function validateCreate(box,e) { setDialogMode(0); var ok = ((Q('ausername').value.length > 0) && (checkEmail(Q('aemail').value) == true) && (Q('apassword1').value.length > 0) && (Q('apassword2').value == Q('apassword1').value)); if ((newAccountPass == 1) && (Q('anewaccountpass').value.length == 0)) { ok = false; } @@ -220,11 +228,33 @@ else if (passStrength >= 60) { QH('passWarning', 'Good Password'); } else { QH('passWarning', 'Weak Password'); } } + if ((e != null) && (e.keyCode == 13)) { + if (box == 1) { Q('aemail').focus(); } + if (box == 2) { Q('apassword1').focus(); } + if (box == 3) { Q('apassword2').focus(); } + if (box == 4) { Q('apasswordhint').focus(); } + if (box == 5) { + if (newAccountPass == 1) { + Q('anewaccountpass').focus(); + } else { + Q('createButton').click(); + } + } + if (box == 6) { + Q('createButton').click(); + } + } + if (e != null) { haltEvent(e); } } - function validateReset() { + function validateReset(e) { setDialogMode(0); - QE('eresetButton', checkEmail(Q('remail').value)); + var x = checkEmail(Q('remail').value); + QE('eresetButton', x); + if ((e != null) && (e.keyCode == 13) && (x == true)) { + Q('eresetButton').click(); + } + if (e != null) { haltEvent(e); } } // Return true is the input string looks like an email address @@ -286,6 +316,8 @@ function messagebox(t, m) { QH('id_dialogMessage', m); setDialogMode(1, t, 1); } function statusbox(t, m) { QH('id_dialogMessage', m); setDialogMode(1, t); } function getDocWidth() { if (window.innerWidth) return window.innerWidth; if (document.documentElement && document.documentElement.clientWidth && document.documentElement.clientWidth != 0) return document.documentElement.clientWidth; return document.getElementsByTagName('body')[0].clientWidth; } + function haltEvent(e) { if (e.preventDefault) e.preventDefault(); if (e.stopPropagation) e.stopPropagation(); return false; } + function haltReturn(e) { if (e.keyCode == 13) { haltEvent(e); } } diff --git a/webserver.js b/webserver.js index 9f4d21f1..5505d7d0 100644 --- a/webserver.js +++ b/webserver.js @@ -447,10 +447,10 @@ module.exports.CreateWebServer = function (parent, db, args, secret, certificate obj.parent.DispatchEvent(['*', 'server-users', user._id], obj, { etype: 'user', username: userinfo.name, account: userinfo, action: 'accountchange', msg: 'Verified email of user ' + EscapeHtml(user.name) + ' (' + EscapeHtml(userinfo.email) + ')', domain: domain.id }) // Send the confirmation page - res.render(obj.path.join(__dirname, 'views/message'), { title: domain.title, title2: domain.title2, title3: 'Account Verification', message: 'Verified e-mail \"' + EscapeHtml(user.email) + '\" for user \"' + EscapeHtml(user.name) + '\". Go to login page.' }); + res.render(obj.path.join(__dirname, 'views/message'), { title: domain.title, title2: domain.title2, title3: 'Account Verification', message: 'Verified email ' + EscapeHtml(user.email) + ' for user account ' + EscapeHtml(user.name) + '. Go to login page.' }); // Send a notification - obj.parent.DispatchEvent([user._id], obj, { action: 'notify', value: 'Email verified: ' + EscapeHtml(userinfo.email) + '.' , nolog: 1 }) + obj.parent.DispatchEvent([user._id], obj, { action: 'notify', value: 'Email verified:
    ' + EscapeHtml(userinfo.email) + '.' , nolog: 1 }) } }); } @@ -485,7 +485,7 @@ module.exports.CreateWebServer = function (parent, db, args, secret, certificate obj.parent.DispatchEvent(['*', 'server-users', user._id], obj, { etype: 'user', username: userinfo.name, account: userinfo, action: 'accountchange', msg: 'Password reset for user ' + EscapeHtml(user.name), domain: domain.id }) // Send the new password - res.render(obj.path.join(__dirname, 'views/message'), { title: domain.title, title2: domain.title2, title3: 'Account Verification', message: 'Password for \"' + EscapeHtml(user.name) + '\" has been reset to \"' + EscapeHtml(newpass) + '\", login and go to the \"My Account\" tab to update your password. Go to login page.' }); + res.render(obj.path.join(__dirname, 'views/message'), { title: domain.title, title2: domain.title2, title3: 'Account Verification', message: '
    Password for account ' + EscapeHtml(user.name) + ' has been reset to:
    ' + EscapeHtml(newpass) + '
    Login and go to the \"My Account\" tab to update your password. Go to login page.' }); }); }); } @@ -617,7 +617,9 @@ module.exports.CreateWebServer = function (parent, db, args, secret, certificate res.render(obj.path.join(__dirname, 'views/default'), { viewmode: viewmode, currentNode: currentNode, logoutControl: logoutcontrol, title: domain.title, title2: domain.title2, domainurl: domain.url, domain: domain.id, debuglevel: parent.debugLevel, serverDnsName: obj.certificates.CommonName, serverRedirPort: args.redirport, serverPublicPort: args.port, noServerBackup: (args.noserverbackup == 1 ? 1 : 0), features: features, mpspass: args.mpspass, webcerthash: obj.webCertificateHashBase64 }); } else { // Send back the login application - res.render(obj.path.join(__dirname, 'views/login'), { loginmode: req.session.loginmode, rootCertLink: getRootCertLink(), title: domain.title, title2: domain.title2, newAccount: domain.newaccounts, newAccountPass: (((domain.newaccountspass == null) || (domain.newaccountspass == '')) ? 0 : 1), serverDnsName: obj.certificates.CommonName, serverPublicPort: obj.args.port, emailcheck: obj.parent.mailserver != null }); + var loginmode = req.session.loginmode; + delete req.session.loginmode; // Clear this state, if the user hits refresh, we want to go back to the login page. + res.render(obj.path.join(__dirname, 'views/login'), { loginmode: loginmode, rootCertLink: getRootCertLink(), title: domain.title, title2: domain.title2, newAccount: domain.newaccounts, newAccountPass: (((domain.newaccountspass == null) || (domain.newaccountspass == '')) ? 0 : 1), serverDnsName: obj.certificates.CommonName, serverPublicPort: obj.args.port, emailcheck: obj.parent.mailserver != null }); } } @@ -636,7 +638,7 @@ module.exports.CreateWebServer = function (parent, db, args, secret, certificate if (req.session && req.session.userid) { if (req.session.domainid != domain.id) { req.session.destroy(function () { res.redirect(domain.url); }); return; } // Check is the session is for the correct domain var user = obj.users[req.session.userid]; - res.render(obj.path.join(__dirname, 'views/terms'), { logoutControl: 'Welcome ' + user.name + '. Logout' }); + res.render(obj.path.join(__dirname, 'views/terms'), { title: domain.title, title2: domain.title2, logoutControl: 'Welcome ' + user.name + '. Logout' }); } else { res.render(obj.path.join(__dirname, 'views/terms'), { title: domain.title, title2: domain.title2 }); }