Skip to content
Snippets Groups Projects
Commit 1ee5ce3f authored by rswindell's avatar rswindell
Browse files

No longer uses "user" as temporary user object variable name (conflicts with 

global user object).
parent a7d5afaa
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
exec/fingerservice.js
+ 24
− 24
View file @ 1ee5ce3f
...@@ -140,26 +140,26 @@ if(request=="") { // no specific user requested, give list of active users ...@@ -140,26 +140,26 @@ if(request=="") { // no specific user requested, give list of active users
,include_age_gender ? dashes : "" ,include_age_gender ? dashes : ""
,include_age_gender ? dashes : "" ,include_age_gender ? dashes : ""
,dashes)); ,dashes));
var user = new User(1); var u = new User(1);
for(n=0;n<system.node_list.length;n++) { for(n=0;n<system.node_list.length;n++) {
if(system.node_list[n].status!=NODE_INUSE) if(system.node_list[n].status!=NODE_INUSE)
continue; 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) 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 else
action=format(NodeAction[system.node_list[n].action] action=format(NodeAction[system.node_list[n].action]
,system.node_list[n].aux); ,system.node_list[n].aux);
t=time()-user.logontime; t=time()-u.logontime;
if(t&0x80000000) t=0; if(t&0x80000000) t=0;
write(format("%-25.25s %-31.31s%3u:%02u:%02u %3s %3s %4d\r\n" write(format("%-25.25s %-31.31s%3u:%02u:%02u %3s %3s %4d\r\n"
,user.alias ,u.alias
,action ,action
,Math.floor(t/(60*60)) ,Math.floor(t/(60*60))
,Math.floor(t/60)%60 ,Math.floor(t/60)%60
,t%60 ,t%60
,include_age_gender ? user.age.toString() : "" ,include_age_gender ? u.age.toString() : ""
,include_age_gender ? user.gender : "" ,include_age_gender ? u.gender : ""
,n+1 ,n+1
)); ));
} }
...@@ -233,17 +233,17 @@ if(request.charAt(0)=='?') { // Handle "special" requests ...@@ -233,17 +233,17 @@ if(request.charAt(0)=='?') { // Handle "special" requests
break; break;
case "nodelist": case "nodelist":
var user = new User(1); var u = new User(1);
for(n=0;n<system.node_list.length;n++) { for(n=0;n<system.node_list.length;n++) {
write(format("Node %2d ",n+1)); write(format("Node %2d ",n+1));
if(system.node_list[n].status==NODE_INUSE) { if(system.node_list[n].status==NODE_INUSE) {
user.number=system.node_list[n].useron; u.number=system.node_list[n].useron;
write(format("%s (%u %s) ", user.alias, user.age, user.gender)); write(format("%s (%u %s) ", u.alias, u.age, u.gender));
if(system.node_list[n].action==NODE_XTRN && system.node_list[n].aux) 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 else
write(format(NodeAction[system.node_list[n].action],system.node_list[n].aux)); 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; if(t&0x80000000) t=0;
write(format(" for %u minutes",Math.floor(t/60))); write(format(" for %u minutes",Math.floor(t/60)));
} else } else
...@@ -379,33 +379,33 @@ if(!usernum) { ...@@ -379,33 +379,33 @@ if(!usernum) {
exit(); exit();
} }
} }
var user = new User(usernum); var u = new User(usernum);
if(user == null) { if(u == null) {
log(format("!INVALID USER NUMBER: %d",usernum)); log(format("!INVALID USER NUMBER: %d",usernum));
exit(); exit();
} }
uname = format("%s #%d", user.alias, user.number); uname = format("%s #%d", u.alias, u.number);
write(format("User: %-30s", uname)); write(format("User: %-30s", uname));
if(include_real_name) if(include_real_name)
write(format(" In real life: %s", user.name)); write(format(" In real life: %s", u.name));
write("\r\n"); write("\r\n");
write(format("From: %s\r\n",user.location)); write(format("From: %s\r\n",u.location));
if(include_age_gender) { if(include_age_gender) {
birth=format("Birth: %s (Age: %u years)" birth=format("Birth: %s (Age: %u years)"
,user.birthdate,user.age); ,u.birthdate,u.age);
write(format("%-42s Gender: %s\r\n" write(format("%-42s Gender: %s\r\n"
,birth,user.gender)); ,birth,u.gender));
} }
write(format("Shell: %-34s Editor: %s\r\n" 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" 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() ,system.zonestr()
,user.connection ,u.connection
,user.host_name ,u.host_name
,user.ip_address)); ,u.ip_address));
done(); done();
......
exec/gopherservice.js
+ 5
− 5
View file @ 1ee5ce3f
...@@ -122,15 +122,15 @@ if(request=="" || request=='/') { /* "root" */ ...@@ -122,15 +122,15 @@ if(request=="" || request=='/') { /* "root" */
switch(request) { switch(request) {
case "nodelist": case "nodelist":
var user = new User(1); var u = new User(1);
for(n=0;n<system.node_list.length;n++) { for(n=0;n<system.node_list.length;n++) {
write(format("Node %2d ",n+1)); write(format("Node %2d ",n+1));
if(system.node_list[n].status==NODE_INUSE) { if(system.node_list[n].status==NODE_INUSE) {
user.number=system.node_list[n].useron; u.number=system.node_list[n].useron;
//write(format("%s (%u %s) ", user.alias, user.age, user.gender)); //write(format("%s (%u %s) ", u.alias, u.age, u.gender));
write(user.alias + " (" + user.age + " " + user.gender +") "); write(u.alias + " (" + u.age + " " + u.gender +") ");
if(system.node_list[n].action==NODE_XTRN && system.node_list[n].aux) if(system.node_list[n].action==NODE_XTRN && system.node_list[n].aux)
write("running %s" + user.curxtrn); write("running %s" + u.curxtrn);
else else
write(format(NodeAction[system.node_list[n].action],system.node_list[n].aux)); write(format(NodeAction[system.node_list[n].action],system.node_list[n].aux));
} else } else
......
exec/nodelist-html.js
+ 9
− 9
View file @ 1ee5ce3f
...@@ -141,21 +141,21 @@ write(format("<th align=center width=10%>%sTime\r\n",font_color)); ...@@ -141,21 +141,21 @@ write(format("<th align=center width=10%>%sTime\r\n",font_color));
writeln("</thead>"); writeln("</thead>");
writeln("<tbody>"); writeln("<tbody>");
var user = new User(1); var u = new User(1);
for(n=0;n<system.node_list.length;n++) { for(n=0;n<system.node_list.length;n++) {
write("<tr>"); write("<tr>");
write(format("<td align=right><font size=-1>%d",n+1)); write(format("<td align=right><font size=-1>%d",n+1));
if(system.node_list[n].status==NODE_INUSE) { 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) 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 else
action=format(NodeAction[system.node_list[n].action] action=format(NodeAction[system.node_list[n].action]
,system.node_list[n].aux); ,system.node_list[n].aux);
write(format( write(format(
"<td align=center><a href=mailto:%s>%s</a>" "<td align=center><a href=mailto:%s>%s</a>"
,user.email ,u.email
,user.alias ,u.alias
)); ));
write(format( write(format(
"<td><font color=yellow>%s" "<td><font color=yellow>%s"
...@@ -164,15 +164,15 @@ for(n=0;n<system.node_list.length;n++) { ...@@ -164,15 +164,15 @@ for(n=0;n<system.node_list.length;n++) {
if(include_location) if(include_location)
write(format( write(format(
"<td align=left>%s" "<td align=left>%s"
,user.location ,u.location
)); ));
if(include_age_gender) if(include_age_gender)
write(format( write(format(
"<td align=center>%d<td align=center>%s" "<td align=center>%d<td align=center>%s"
,user.age ,u.age
,user.gender ,u.gender
)); ));
t=time()-user.logontime; t=time()-u.logontime;
if(t&0x80000000) t=0; if(t&0x80000000) t=0;
write(format( write(format(
"<td align=center>%u:%02u:%02u" "<td align=center>%u:%02u:%02u"
......
exec/nodelist.js
+ 3
− 3
View file @ 1ee5ce3f
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
load("nodedefs.js"); load("nodedefs.js");
var user = new User(1); var u = new User(1);
for(n=0;n<system.node_list.length;n++) { for(n=0;n<system.node_list.length;n++) {
printf("Node %2d ",n+1); printf("Node %2d ",n+1);
if(system.node_list[n].status==NODE_INUSE) { if(system.node_list[n].status==NODE_INUSE) {
user.number=system.node_list[n].useron; u.number=system.node_list[n].useron;
printf("%s (%u %s) ", user.alias, user.age, user.gender); printf("%s (%u %s) ", u.alias, u.age, u.gender);
printf(NodeAction[system.node_list[n].action],system.node_list[n].aux); printf(NodeAction[system.node_list[n].action],system.node_list[n].aux);
} else } else
printf(NodeStatus[system.node_list[n].status],system.node_list[n].aux); printf(NodeStatus[system.node_list[n].status],system.node_list[n].aux);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment