Skip to content
Snippets Groups Projects
Commit f1591f88 authored by Rob Swindell's avatar Rob Swindell :speech_balloon:
Browse files

Merge branch 'Ree/nodelist-external-name' into 'master'

Update node action display on web

See merge request !329
parents 17b42ea2 a4ba1760
No related branches found
No related tags found
2 merge requests!463MRC mods by Codefenix (2024-10-20),!329Update node action display on web
...@@ -138,7 +138,7 @@ function extended_status(num) ...@@ -138,7 +138,7 @@ function extended_status(num)
f.position = num * 128; f.position = num * 128;
var str = f.read(128); var str = f.read(128);
f.close(); f.close();
return str; return truncsp(str);
} }
// Returns a string describing the node status, suitable for printing on a single line // Returns a string describing the node status, suitable for printing on a single line
...@@ -148,11 +148,13 @@ function extended_status(num) ...@@ -148,11 +148,13 @@ function extended_status(num)
// options values supported/used: // options values supported/used:
// .include_age // .include_age
// .include_gender // .include_gender
// .exclude_username
// .username_prefix // .username_prefix
// .status_prefix // .status_prefix
// .age_prefix // .age_prefix
// .gender_prefix // .gender_prefix
// .gender_separator // .gender_separator
// .exclude_connection
// .connection_prefix // .connection_prefix
// .errors_prefix // .errors_prefix
function node_status(node, is_sysop, options, num) function node_status(node, is_sysop, options, num)
...@@ -174,12 +176,14 @@ function node_status(node, is_sysop, options, num) ...@@ -174,12 +176,14 @@ function node_status(node, is_sysop, options, num)
} }
var user = new User(node.useron); var user = new User(node.useron);
if(options.username_prefix) if (!options.exclude_username) {
output += options.username_prefix; if(options.username_prefix)
if(js.global.bbs && (misc&NODE_ANON) && !is_sysop) output += options.username_prefix;
output += bbs.text(UNKNOWN_USER); if(js.global.bbs && (misc&NODE_ANON) && !is_sysop)
else output += bbs.text(UNKNOWN_USER);
output += user.alias; else
output += user.alias;
}
if(options.status_prefix) if(options.status_prefix)
output += options.status_prefix; output += options.status_prefix;
output += user_age_and_gender(user, options); output += user_age_and_gender(user, options);
...@@ -201,9 +205,11 @@ function node_status(node, is_sysop, options, num) ...@@ -201,9 +205,11 @@ function node_status(node, is_sysop, options, num)
output += format(NodeAction[node.action], node.aux); output += format(NodeAction[node.action], node.aux);
break; break;
} }
if(options.connection_prefix) if (!options.exclude_connection) {
output += options.connection_prefix; if(options.connection_prefix)
output += node_connection_desc(node); output += options.connection_prefix;
output += node_connection_desc(node);
}
break; break;
} }
case NODE_LOGON: case NODE_LOGON:
......
require("presence_lib.js", 'extended_status');
var last_run = 0; var last_run = 0;
var frequency = 15; var frequency = 15;
...@@ -80,10 +82,11 @@ function scan() { ...@@ -80,10 +82,11 @@ function scan() {
}; };
} else { } else {
usr.number = e.useron; usr.number = e.useron;
return { return {
node: i + 1, node: i + 1,
status: format(NodeStatus[e.status], e.aux, e.extaux), status: format(NodeStatus[e.status], e.aux, e.extaux),
action: format(NodeAction[e.action], e.aux, e.extaux), action: node_status(e, user.is_sysop, {exclude_username: true, exclude_connection: true}, i),
user: (e.misc & NODE_ANON) && !user.is_sysop ? "Anonymous" : usr.alias, user: (e.misc & NODE_ANON) && !user.is_sysop ? "Anonymous" : usr.alias,
connection : NodeConnectionProper[e.connection] ? NodeConnectionProper[e.connection] : (e.connection + ' bps') connection : NodeConnectionProper[e.connection] ? NodeConnectionProper[e.connection] : (e.connection + ' bps')
}; };
......
require('sbbsdefs.js', 'SYS_CLOSED'); require('sbbsdefs.js', 'SYS_CLOSED');
require('nodedefs.js', 'NODE_WFC'); require('nodedefs.js', 'NODE_WFC');
require("presence_lib.js", 'extended_status');
var settings = load('modopts.js', 'web') || { web_directory: '../webv4' }; var settings = load('modopts.js', 'web') || { web_directory: '../webv4' };
load(settings.web_directory + '/lib/init.js'); load(settings.web_directory + '/lib/init.js');
...@@ -42,7 +43,7 @@ if ((http_request.method === 'GET' || http_request.method === 'POST') && http_re ...@@ -42,7 +43,7 @@ if ((http_request.method === 'GET' || http_request.method === 'POST') && http_re
a.push({ a.push({
node: i, node: i,
status: format(NodeStatus[c.status], c.aux, c.extaux), status: format(NodeStatus[c.status], c.aux, c.extaux),
action: format(NodeAction[c.action], c.aux, c.extaux), action: node_status(c, user.is_sysop, {exclude_username: true, exclude_connection: true}, i),
user: usr.alias, user: usr.alias,
connection: usr.connection connection: usr.connection
}); });
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment