Skip to content
Snippets Groups Projects
Commit 83541cbd authored by rswindell's avatar rswindell
Browse files

MsgBase object requires a call to msgbase.open() now.

Replaced most format() calls with concatenated strings (bug hunting).
parent 5a323dc9
No related branches found
No related tags found
No related merge requests found
...@@ -10,7 +10,7 @@ load("sbbsdefs.js"); ...@@ -10,7 +10,7 @@ load("sbbsdefs.js");
load("nodedefs.js"); load("nodedefs.js");
const VERSION = "1.00 Alpha"; const VERSION = "1.00 Alpha";
const GOPHER_PORT = 70; const GOPHER_PORT = client.socket.local_port;
var debug = false; var debug = false;
var no_anonymous = false; var no_anonymous = false;
...@@ -24,7 +24,7 @@ for(i=0;i<argc;i++) ...@@ -24,7 +24,7 @@ for(i=0;i<argc;i++)
function write(str) function write(str)
{ {
if(0 && debug) if(0 && debug)
log(format("rsp: %s",str)); log("rsp: " + str);
client.socket.send(str); client.socket.send(str);
} }
...@@ -62,7 +62,7 @@ if(request==null) { ...@@ -62,7 +62,7 @@ if(request==null) {
exit(); exit();
} }
log(format("client request: '%s'",request)); log("client request: '" + request + "'");
var gopher_plus=false; var gopher_plus=false;
if((term=request.indexOf("\t+"))>=0) { if((term=request.indexOf("\t+"))>=0) {
...@@ -73,12 +73,10 @@ if((term=request.indexOf("\t+"))>=0) { ...@@ -73,12 +73,10 @@ if((term=request.indexOf("\t+"))>=0) {
if(request=="" || request=='/') { /* "root" */ if(request=="" || request=='/') { /* "root" */
for(g in msg_area.grp_list) for(g in msg_area.grp_list)
writeln(format("1%s\tgrp:%s\t%s\t%u" writeln("1" + msg_area.grp_list[g].description
,msg_area.grp_list[g].description + "\tgrp:" + msg_area.grp_list[g].name.toLowerCase()
,msg_area.grp_list[g].name.toLowerCase() + "\t" + system.inetaddr
,system.inetaddr + "\t" + GOPHER_PORT);
,GOPHER_PORT
));
/** to-do /** to-do
for(l in file_area.lib_list) for(l in file_area.lib_list)
writeln(format("1%s\tlib:%s\t%s\t%u" writeln(format("1%s\tlib:%s\t%s\t%u"
...@@ -88,24 +86,15 @@ if(request=="" || request=='/') { /* "root" */ ...@@ -88,24 +86,15 @@ if(request=="" || request=='/') { /* "root" */
,GOPHER_PORT ,GOPHER_PORT
)); ));
**/ **/
writeln(format("0%s\t%s\t%s\t%u" writeln("0Node List\tnodelist"
,"Node List" +"\t" + system.inetaddr
,"nodelist" +"\t" + GOPHER_PORT);
,system.inetaddr writeln("0Logon List\tlogonlist"
,GOPHER_PORT +"\t" + system.inetaddr
)); +"\t" + GOPHER_PORT);
writeln(format("0%s\t%s\t%s\t%u" writeln("0Auto-Message\tautomsg"
,"Logon List" +"\t" + system.inetaddr
,"logonlist" +"\t" + GOPHER_PORT);
,system.inetaddr
,GOPHER_PORT
));
writeln(format("0%s\t%s\t%s\t%u"
,"Auto-Message"
,"automsg"
,system.inetaddr
,GOPHER_PORT
));
exit(); exit();
} }
...@@ -117,9 +106,10 @@ switch(request) { ...@@ -117,9 +106,10 @@ switch(request) {
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; user.number=system.node_list[n].useron;
write(format("%s (%u %s) ", user.alias, user.age, user.gender)); //write(format("%s (%u %s) ", user.alias, user.age, user.gender));
write(user.alias + " (" + user.age + " " + user.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",user.curxtrn)); write("running %s" + user.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
...@@ -143,13 +133,15 @@ switch(field[0]) { ...@@ -143,13 +133,15 @@ switch(field[0]) {
for(g in msg_area.grp_list) for(g in msg_area.grp_list)
if(msg_area.grp_list[g].name.toLowerCase()==field[1]) { if(msg_area.grp_list[g].name.toLowerCase()==field[1]) {
for(s in msg_area.grp_list[g].sub_list) for(s in msg_area.grp_list[g].sub_list)
writeln(format("1[%s] %s\tsub:%s\t%s\t%u" writeln("1[" + msg_area.grp_list[g].name + "] "
,msg_area.grp_list[g].name + msg_area.grp_list[g].sub_list[s].description
,msg_area.grp_list[g].sub_list[s].description + "\tsub:"
,msg_area.grp_list[g].sub_list[s].code.toLowerCase() + msg_area.grp_list[g].sub_list[s].code.toLowerCase()
,system.inetaddr + "\t"
,GOPHER_PORT + system.inetaddr
)); + "\t"
+ GOPHER_PORT
);
break; break;
} }
break; break;
...@@ -169,14 +161,19 @@ switch(field[0]) { ...@@ -169,14 +161,19 @@ switch(field[0]) {
break; break;
case "sub": case "sub":
msgbase = new MsgBase(field[1]); msgbase = new MsgBase(field[1]);
if(msgbase.open!=undefined && msgbase.open()==false) {
writeln("!ERROR " + msgbase.last_error);
break;
}
if(Number(field[2])) { if(Number(field[2])) {
hdr=msgbase.get_msg_header(false,Number(field[2])); hdr=msgbase.get_msg_header(false,Number(field[2]));
if(hdr.attr&MSG_DELETE) if(hdr.attr&MSG_DELETE)
break; break;
writeln(format("Subj : %s",hdr.subject)); writeln("Subj : " + hdr.subject);
writeln(format("To : %s",hdr.to)); writeln("To : " + hdr.to);
writeln(format("From : %s",hdr.from)); writeln("From : " + hdr.from);
writeln(format("Date : %s",system.timestr(hdr.when_written_time))); writeln("Date : " + system.timestr(hdr.when_written_time));
writeln(""); writeln("");
body=msgbase.get_msg_body(false,Number(field[2]),true) body=msgbase.get_msg_body(false,Number(field[2]),true)
writeln(body); writeln(body);
...@@ -198,19 +195,18 @@ switch(field[0]) { ...@@ -198,19 +195,18 @@ switch(field[0]) {
continue; continue;
if(hdr.attr&MSG_DELETE) if(hdr.attr&MSG_DELETE)
continue; continue;
date = system.timestr(hdr.when_written_time);
msginfo=format("%-25.25s %-25.25s %-25.25s %s" msginfo=format("%-25.25s %-25.25s %-25.25s %s"
,hdr.subject ,hdr.subject
,hdr.from ,hdr.from
,hdr.to ,hdr.to
,system.timestr(hdr.when_written_time) ,date
);
writeln("0" + msginfo + "\tsub:"
+ field[1] + ":" + i + "\t"
+ system.inetaddr + "\t"
+ GOPHER_PORT
); );
writeln(format("0%s\tsub:%s:%u\t%s\t%u"
,msginfo
,field[1]
,i
,system.inetaddr
,GOPHER_PORT
));
} }
msgbase.close(); msgbase.close();
break; break;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment