| 5.9.11 |
2021-11-12 |
diff --git a/docs/index.html b/docs/index.html
index fa7560d..692ffff 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -170,7 +170,7 @@
systeminformation
- New Version: 5.9.11
+ New Version: 5.9.12
diff --git a/lib/users.js b/lib/users.js
index 248fea0..fcc18f6 100644
--- a/lib/users.js
+++ b/lib/users.js
@@ -297,34 +297,36 @@ function users(callback) {
util.powerShell(cmd).then(data => {
// controller + vram
// let accounts = parseWinAccounts(data[0].split(/\n\s*\n/));
- data = data.split('#-#-#-#');
- let sessions = parseWinSessions(data[0].split(/\n\s*\n/));
- let loggedons = parseWinLoggedOn(data[1].split(/\n\s*\n/));
- let users = parseWinUsers(data[2].split(/\n\s*\n/));
- for (let id in loggedons) {
- if ({}.hasOwnProperty.call(loggedons, id)) {
- loggedons[id].dateTime = {}.hasOwnProperty.call(sessions, id) ? sessions[id] : '';
- }
- }
- users.forEach(user => {
- let dateTime = '';
+ if (data) {
+ data = data.split('#-#-#-#');
+ let sessions = parseWinSessions(data[0].split(/\n\s*\n/));
+ let loggedons = parseWinLoggedOn(data[1].split(/\n\s*\n/));
+ let users = parseWinUsers(data[2].split(/\n\s*\n/));
for (let id in loggedons) {
if ({}.hasOwnProperty.call(loggedons, id)) {
- if (loggedons[id].user === user.user && (!dateTime || dateTime < loggedons[id].dateTime)) {
- dateTime = loggedons[id].dateTime;
- }
+ loggedons[id].dateTime = {}.hasOwnProperty.call(sessions, id) ? sessions[id] : '';
}
}
+ users.forEach(user => {
+ let dateTime = '';
+ for (let id in loggedons) {
+ if ({}.hasOwnProperty.call(loggedons, id)) {
+ if (loggedons[id].user === user.user && (!dateTime || dateTime < loggedons[id].dateTime)) {
+ dateTime = loggedons[id].dateTime;
+ }
+ }
+ }
- result.push({
- user: user.user,
- tty: '',
- date: `${dateTime.substr(0, 4)}-${dateTime.substr(4, 2)}-${dateTime.substr(6, 2)}`,
- time: `${dateTime.substr(8, 2)}:${dateTime.substr(10, 2)}`,
- ip: '',
- command: ''
+ result.push({
+ user: user.user,
+ tty: '',
+ date: `${dateTime.substr(0, 4)}-${dateTime.substr(4, 2)}-${dateTime.substr(6, 2)}`,
+ time: `${dateTime.substr(8, 2)}:${dateTime.substr(10, 2)}`,
+ ip: '',
+ command: ''
+ });
});
- });
+ }
if (callback) { callback(result); }
resolve(result);