' + userSessions[i].State + ', ' + userSessions[i].StationName;
+ x += '
' + userSessions[i].State + (userSessions[i].StationName ? (', ' + userSessions[i].StationName) : '');
if (userSessions[i].Username) { if (userSessions[i].Domain) { x += ' - ' + userSessions[i].Domain + '/' + userSessions[i].Username; } else { x += ' - ' + userSessions[i].Username; } }
x += '
';
}
QH('p11DeskSessionSelector', x);
QV('p11DeskSessionSelector', true);
}
- } else if (message.type == 'psinfo') {
- if (xxdialogTag == ('ps|' + message.nodeid + '|' + message.pid)) {
+ } else if (message.type === 'psinfo') {
+ if (xxdialogTag === ('ps|' + message.nodeid + '|' + message.pid)) {
var x = '
';
//x += addHtmlValue4("Process ID", message.pid);
if ((typeof message.value == 'object') && (Object.keys(message.value).length > 0)) {
@@ -2518,7 +2518,7 @@
}
}
} else {
- if (message.type == 'notify') { // This is a notification message.
+ if (message.type === 'notify') { // This is a notification message.
var n = { text: message.value, title: message.title, icon: message.icon, titleid: message.titleid, msgid: message.msgid, args: message.args };
if (message.id != null) { n.id = message.id; }
if (message.tag != null) { n.tag = message.tag; }
@@ -9489,8 +9489,9 @@
x += addHtmlValue("Key File", '
' + '
' + "Key file must be in OpenSSH format." + '
');
x += addHtmlValue("Key Password", '
');
x += '
';
- x += addHtmlValue('', '
');
+ if ((features2 & 0x00400000) == 0) { x += addHtmlValue('', '
'); }
setDialogMode(2, "Authentication", 11, sshConnectEx, x, 'ssh');
+ Q('dp2user').focus();
setTimeout(sshAuthUpdate, 50);
break;
}
@@ -9525,15 +9526,25 @@
reader.readAsText(Q('dp2key').files[0]);
}
}
+
+ // When the enter key is pressed, move to the next field
+ if (e && (e.keyCode == 13) && (e.target) && (Q('dp2authmethod').value == 1)) {
+ if (e.target.id == 'dp2user') { Q('dp2pass').focus(); }
+ if (e.target.id == 'dp2pass') { dialogclose(1); }
+ }
}
+
function sshConnectEx(b) {
if (b == 0) {
if (terminal != null) { connectTerminal(); } // Disconnect
} else {
+ var keep = false;
+ if ((features2 & 0x00400000) == 0) { keep = Q('dp2keep').checked; }
+
if (Q('dp2authmethod').value == 1) {
- terminal.socket.send(JSON.stringify({ action: 'sshauth', username: Q('dp2user').value, password: Q('dp2pass').value, keep: Q('dp2keep').checked, cols: xterm.cols, rows: xterm.rows, width: Q('termarea3xdiv').offsetWidth, height: Q('termarea3xdiv').offsetHeight }));
+ terminal.socket.send(JSON.stringify({ action: 'sshauth', username: Q('dp2user').value, password: Q('dp2pass').value, keep: keep, cols: xterm.cols, rows: xterm.rows, width: Q('termarea3xdiv').offsetWidth, height: Q('termarea3xdiv').offsetHeight }));
} else {
- var reader = new FileReader(), username = Q('dp2user').value, keypass = Q('dp2keypass').value, keep = Q('dp2keep').checked;
+ var reader = new FileReader(), username = Q('dp2user').value, keypass = Q('dp2keypass').value;
reader.onload = function (e) { terminal.socket.send(JSON.stringify({ action: 'sshauth', username: username, keypass: keypass, key: e.target.result, keep: keep, cols: xterm.cols, rows: xterm.rows, width: Q('termarea3xdiv').offsetWidth, height: Q('termarea3xdiv').offsetHeight })); }
reader.readAsText(Q('dp2key').files[0]);
}
@@ -9881,8 +9892,9 @@
x += addHtmlValue("Key File", '
');
x += addHtmlValue("Key Password", '
');
x += '