From 1ee5ce3f0ce3fd9dc3af577f6ae91e3511e48d11 Mon Sep 17 00:00:00 2001
From: rswindell <>
Date: Wed, 2 Apr 2003 00:43:56 +0000
Subject: [PATCH] No longer uses "user" as temporary user object variable name
(conflicts with global user object).
---
exec/fingerservice.js | 48 +++++++++++++++++++++----------------------
exec/gopherservice.js | 10 ++++-----
exec/nodelist-html.js | 18 ++++++++--------
exec/nodelist.js | 6 +++---
4 files changed, 41 insertions(+), 41 deletions(-)
diff --git a/exec/fingerservice.js b/exec/fingerservice.js
index 28dbcad8b8..ab67c64185 100644
--- a/exec/fingerservice.js
+++ b/exec/fingerservice.js
@@ -140,26 +140,26 @@ if(request=="") { // no specific user requested, give list of active users
,include_age_gender ? dashes : ""
,include_age_gender ? dashes : ""
,dashes));
- var user = new User(1);
+ var u = new User(1);
for(n=0;n<system.node_list.length;n++) {
if(system.node_list[n].status!=NODE_INUSE)
continue;
- user.number=system.node_list[n].useron;
+ u.number=system.node_list[n].useron;
if(system.node_list[n].action==NODE_XTRN && system.node_list[n].aux)
- action=format("running %s",xtrn_name(user.curxtrn));
+ action=format("running %s",xtrn_name(u.curxtrn));
else
action=format(NodeAction[system.node_list[n].action]
,system.node_list[n].aux);
- t=time()-user.logontime;
+ t=time()-u.logontime;
if(t&0x80000000) t=0;
write(format("%-25.25s %-31.31s%3u:%02u:%02u %3s %3s %4d\r\n"
- ,user.alias
+ ,u.alias
,action
,Math.floor(t/(60*60))
,Math.floor(t/60)%60
,t%60
- ,include_age_gender ? user.age.toString() : ""
- ,include_age_gender ? user.gender : ""
+ ,include_age_gender ? u.age.toString() : ""
+ ,include_age_gender ? u.gender : ""
,n+1
));
}
@@ -233,17 +233,17 @@ if(request.charAt(0)=='?') { // Handle "special" requests
break;
case "nodelist":
- var user = new User(1);
+ var u = new User(1);
for(n=0;n<system.node_list.length;n++) {
write(format("Node %2d ",n+1));
if(system.node_list[n].status==NODE_INUSE) {
- user.number=system.node_list[n].useron;
- write(format("%s (%u %s) ", user.alias, user.age, user.gender));
+ u.number=system.node_list[n].useron;
+ write(format("%s (%u %s) ", u.alias, u.age, u.gender));
if(system.node_list[n].action==NODE_XTRN && system.node_list[n].aux)
- write(format("running %s",xtrn_name(user.curxtrn)));
+ write(format("running %s",xtrn_name(u.curxtrn)));
else
write(format(NodeAction[system.node_list[n].action],system.node_list[n].aux));
- t=time()-user.logontime;
+ t=time()-u.logontime;
if(t&0x80000000) t=0;
write(format(" for %u minutes",Math.floor(t/60)));
} else
@@ -379,33 +379,33 @@ if(!usernum) {
exit();
}
}
-var user = new User(usernum);
-if(user == null) {
+var u = new User(usernum);
+if(u == null) {
log(format("!INVALID USER NUMBER: %d",usernum));
exit();
}
-uname = format("%s #%d", user.alias, user.number);
+uname = format("%s #%d", u.alias, u.number);
write(format("User: %-30s", uname));
if(include_real_name)
- write(format(" In real life: %s", user.name));
+ write(format(" In real life: %s", u.name));
write("\r\n");
-write(format("From: %s\r\n",user.location));
+write(format("From: %s\r\n",u.location));
if(include_age_gender) {
birth=format("Birth: %s (Age: %u years)"
- ,user.birthdate,user.age);
+ ,u.birthdate,u.age);
write(format("%-42s Gender: %s\r\n"
- ,birth,user.gender));
+ ,birth,u.gender));
}
write(format("Shell: %-34s Editor: %s\r\n"
- ,user.command_shell,user.editor));
+ ,u.command_shell,u.editor));
write(format("Last login %s %s\r\nvia %s from %s [%s]\r\n"
- ,system.timestr(user.stats.laston_date)
+ ,system.timestr(u.stats.laston_date)
,system.zonestr()
- ,user.connection
- ,user.host_name
- ,user.ip_address));
+ ,u.connection
+ ,u.host_name
+ ,u.ip_address));
done();
diff --git a/exec/gopherservice.js b/exec/gopherservice.js
index 9621672334..ef649dafe0 100644
--- a/exec/gopherservice.js
+++ b/exec/gopherservice.js
@@ -122,15 +122,15 @@ if(request=="" || request=='/') { /* "root" */
switch(request) {
case "nodelist":
- var user = new User(1);
+ var u = new User(1);
for(n=0;n<system.node_list.length;n++) {
write(format("Node %2d ",n+1));
if(system.node_list[n].status==NODE_INUSE) {
- user.number=system.node_list[n].useron;
- //write(format("%s (%u %s) ", user.alias, user.age, user.gender));
- write(user.alias + " (" + user.age + " " + user.gender +") ");
+ u.number=system.node_list[n].useron;
+ //write(format("%s (%u %s) ", u.alias, u.age, u.gender));
+ write(u.alias + " (" + u.age + " " + u.gender +") ");
if(system.node_list[n].action==NODE_XTRN && system.node_list[n].aux)
- write("running %s" + user.curxtrn);
+ write("running %s" + u.curxtrn);
else
write(format(NodeAction[system.node_list[n].action],system.node_list[n].aux));
} else
diff --git a/exec/nodelist-html.js b/exec/nodelist-html.js
index 1c9cae5930..0b63975e97 100644
--- a/exec/nodelist-html.js
+++ b/exec/nodelist-html.js
@@ -141,21 +141,21 @@ write(format("<th align=center width=10%>%sTime\r\n",font_color));
writeln("</thead>");
writeln("<tbody>");
-var user = new User(1);
+var u = new User(1);
for(n=0;n<system.node_list.length;n++) {
write("<tr>");
write(format("<td align=right><font size=-1>%d",n+1));
if(system.node_list[n].status==NODE_INUSE) {
- user.number=system.node_list[n].useron;
+ u.number=system.node_list[n].useron;
if(system.node_list[n].action==NODE_XTRN && system.node_list[n].aux)
- action=format("running %s",xtrn_name(user.curxtrn));
+ action=format("running %s",xtrn_name(u.curxtrn));
else
action=format(NodeAction[system.node_list[n].action]
,system.node_list[n].aux);
write(format(
"<td align=center><a href=mailto:%s>%s</a>"
- ,user.email
- ,user.alias
+ ,u.email
+ ,u.alias
));
write(format(
"<td><font color=yellow>%s"
@@ -164,15 +164,15 @@ for(n=0;n<system.node_list.length;n++) {
if(include_location)
write(format(
"<td align=left>%s"
- ,user.location
+ ,u.location
));
if(include_age_gender)
write(format(
"<td align=center>%d<td align=center>%s"
- ,user.age
- ,user.gender
+ ,u.age
+ ,u.gender
));
- t=time()-user.logontime;
+ t=time()-u.logontime;
if(t&0x80000000) t=0;
write(format(
"<td align=center>%u:%02u:%02u"
diff --git a/exec/nodelist.js b/exec/nodelist.js
index a7bdb9d388..4b6181735c 100644
--- a/exec/nodelist.js
+++ b/exec/nodelist.js
@@ -2,12 +2,12 @@
load("nodedefs.js");
-var user = new User(1);
+var u = new User(1);
for(n=0;n<system.node_list.length;n++) {
printf("Node %2d ",n+1);
if(system.node_list[n].status==NODE_INUSE) {
- user.number=system.node_list[n].useron;
- printf("%s (%u %s) ", user.alias, user.age, user.gender);
+ u.number=system.node_list[n].useron;
+ printf("%s (%u %s) ", u.alias, u.age, u.gender);
printf(NodeAction[system.node_list[n].action],system.node_list[n].aux);
} else
printf(NodeStatus[system.node_list[n].status],system.node_list[n].aux);
--
GitLab