Merge pull request #145 from dgets/message-scan-work

Message scan work: Got everything taken care of except the question for the new message scan which takes people into the wrong interface. This is much progress for now; I'll take care of the last bit later.

Author: dgets

misc/login.js

@@ -54,13 +54,28 @@ for(var c=0; c<10; c++) {
 	// Continue normal login (prompting for password)
 	// modified by Khelair for usage w/ddoc2
 	if(bbs.login(str, "\1n\1c\1hPW:\b\b\bPassword: \1w")) {
+                /*
+                //while we're in a debugging mode here
+                console.putmsg("Shell: " + user.command_shell.toUpperCase() +
+                  " (to upper)\n");
+                console.getkey();   //since we're not seeing the pause w/ddoc
+              
 		//check to see if we're a ddoc user, skip interactive if so
 		if (user.command_shell.toUpperCase() == "DDOC") {
 		  exit();
 		} else {
 		  bbs.logon();
 		  exit();
-		}
+		} */
+                /*if (console.noyes("Quick login?")) {
+                    bbs.logon();
+                    exit();
+                } else {
+                    exit();
+                }*/
+
+		bbs.logon();
+		exit();
 	}
 	console.clearkeybuffer();	// Clear pending input (e.g. mistyped system password)
 	bbs.rlogin_name='';		// Clear user/login name (if supplied via protocol)

misc/logon.js

@@ -0,0 +1,241 @@
+// logon.js
+
+// Synchronet v3.1 Default Logon Module
+
+// $Id: logon.js,v 1.22 2013/10/15 13:16:04 deuce Exp $
+
+// @format.tab-size 4, @format.use-tabs true
+
+load("sbbsdefs.js");
+load("text.js");
+load("asc2htmlterm.js");
+var options = load("modopts.js", "logon");
+
+// Check if we're being asked to auto-run an external (web interface external programs section uses this)
+if (options && (options.rlogin_auto_xtrn) && (bbs.sys_status & SS_RLOGIN) && (console.terminal.indexOf("xtrn=") === 0)) {
+    var external_code = console.terminal.substring(5);
+    if (!bbs.exec_xtrn(external_code)) {
+        alert(log(LOG_ERR,"!ERROR Unable to launch external: '" + external_code + "'"));
+    }
+    bbs.hangup();
+	exit();
+}
+
+//Disable spinning cursor at pause prompts
+bbs.node_settings|=NM_NOPAUSESPIN	
+
+if(user.security.restrictions&UFLAG_G) {
+	while(bbs.online) {
+		printf("\1y\1hFor our records, please enter your full name: \1w");
+		name=console.getstr(LEN_NAME,K_UPRLWR);
+		if(!name || !name.length)
+			continue;
+		bbs.log_str("Guest: " + name);
+		user.name = name;
+		break;
+	}
+
+	while(bbs.online) {
+		printf("\1y\1hPlease enter your e-mail address: \1w");
+		email=console.getstr(LEN_NETMAIL);
+		if(!email || !email.length)
+			continue;
+		bbs.log_str("  " + email);
+		user.netmail=email;
+		user.settings|=USER_NETMAIL;
+		break;
+	}
+		
+	while(bbs.online) {
+		printf("\1y\1hPlease enter your location (City, State): \1w");
+		location=console.getstr(LEN_LOCATION,K_UPRLWR);
+		if(!location || !location.length)
+			continue;
+		bbs.log_str("  " + location);
+		user.location=location;
+		break;
+	}
+
+	if(bbs.online)
+		bbs.log_str("\r\n");
+	while(bbs.online) {
+		printf("\1y\1hWhere did you hear about this BBS?\r\n: \1w");
+		ref=console.getstr(70);
+		if(!ref || !ref.length)
+			continue;
+		bbs.log_str(ref + "\r\n");
+		break;
+	}
+
+//	print("name: " + user.name);
+//	print("email: " + user.netmail);
+//	print("location: " + user.location);
+}
+
+
+// Force split-screen chat on ANSI users
+if(user.settings&USER_ANSI)
+	user.chat_settings|=CHAT_SPLITP;
+
+// Inactivity exemption
+if(user.security.exemptions&UFLAG_H)
+	console.status|=CON_NO_INACT;
+
+/******************************
+* Replaces the 2.1 Logon stuff
+******************************/
+
+var ouah = console.noyes("Quick login? (straight to shell/no ANSI)");
+if (ouah) {
+  // Logon screens
+
+  // Print logon screens based on security level
+  if(file_exists(system.text_dir + "menu/logon" + user.security.level + ".*"))
+	bbs.menu("logon" + user.security.level);
+
+  // Print successively numbered logon screens (logon, logon1, logon2, etc.)
+  for(var i=0;;i++) {
+	var fname="logon";
+	if(i)
+		fname+=i;
+	if(!file_exists(system.text_dir + "menu/" + fname + ".*")) {
+		if(i>1)
+			break;
+		continue;
+	}
+	bbs.menu(fname);
+  }
+
+  // Print one of text/menu/random*.*, picked at random
+  // e.g. random1.asc, random2.asc, random3.asc, etc.
+  var random_list = directory(system.text_dir + "menu/random*.*");
+  if(random_list.length)
+	bbs.menu(file_getname(random_list[random(random_list.length)]).slice(0,-4));
+}
+
+console.clear();
+bbs.user_event(EVENT_LOGON);
+
+/*
+	* Disable HTML mode if not using an HTML shell
+	* If you don't do this, you'll get HTML menus that flash on
+	* screen then disappear when the ANSI prompt is displayed
+	*
+	* It's still in the autoterm variable, so you CAN switch
+	*/
+if(user.settings&USER_HTML) {
+	if(user.command_shell.search(/html/i)==-1)
+		user.settings&=~USER_HTML;
+}
+
+if(user.settings&USER_HTML) {
+	var buf="\2\2<html><head><title>Welcome status screen</title></head><body bgcolor=\"black\" text=\"#a8a8a8\">";
+
+	// Last few callers
+	logonlst=system.data_dir + "logon.lst"
+	if(file_size(logonlst)<1)
+		buf += asc2htmlterm("\1n\1g\1hYou are the first caller of the day!\r\n",false,true).replace(/(?:&nbsp;)*<br>/g,'<br>');
+	else {
+		f=new File(logonlst);
+		if(f.open("rb",true,f.length)) {
+			var lastbuf=f.read(f.length);
+			f.close();
+			lastbuf = lastbuf.replace(/^.*((?:[\x00\x09\x0b-\xff]*[\n]){1,4})$/,'$1');
+			buf += asc2htmlterm("\1n\1g\1hLast few callers:\1n\r\n",false,true).replace(/(?:&nbsp;)*<br>/g,'<br>');
+			buf += asc2htmlterm(lastbuf, false, true).replace(/(?:&nbsp;)*<br>/g,'<br>');
+		}
+	}
+	buf += '&nbsp;<br>';
+
+	// Auto-message
+	auto_msg=system.data_dir + "msgs/auto.msg"
+	if(file_size(auto_msg)>0) {
+		f=new File(auto_msg);
+		if(f.open("rb",true,f.length)) {
+			buf += asc2htmlterm(f.read(f.length), false, true, P_NOATCODES).replace(/(?:&nbsp;)*<br>/g,'<br>');
+			f.close();
+		}
+
+		buf += '&nbsp;<br>';
+	}
+
+	if(!(system.settings&SYS_NOSYSINFO)) {
+		buf += asc2htmlterm(format(bbs.text(SiSysName),system.name)
+					+ format(bbs.text(LiUserNumberName),user.number,user.alias)
+					+ format(bbs.text(LiLogonsToday),user.stats.logonstoday
+							,user.limits.logons_per_day)
+					+ format(bbs.text(LiTimeonToday),user.stats.timeon_today
+							,user.limits.time_per_day+user.security.minutes)
+					+ format(bbs.text(LiMailWaiting),user.mail_waiting)
+				, false, true).replace(/(?:&nbsp;)*<br>/g,'<br>');
+			/*
+				* Notes:
+				* 1) We cannot access cfg.sys_char_ar
+				* 2) logon.cpp and chat.cpp differ... chat.cpp adds useron.exempt&FLAG('C')
+				*/
+			/*
+			strcpy(str,bbs.text[LiSysopIs]);
+			if(bbs.startup_options&BBS_OPT_SYSOP_AVAILABLE
+					|| (cfg.sys_chat_ar[0] && chk_ar(cfg.sys_chat_ar,&useron)))
+					strcat(str,bbs.text[LiSysopAvailable]);
+			else
+					strcat(str,bbs.text[LiSysopNotAvailable]);
+			format("%s\r\n\r\n",str);
+			*/
+	}
+
+	buf += "<br><a href=\" \">Click here to continue...</a></body>\n\2";
+	/* Disable autopause */
+	var os = bbs.sys_status;
+	bbs.sys_status |= SS_PAUSEOFF;
+	bbs.sys_status &= ~SS_PAUSEON;
+	console.write(buf);
+	bbs.sys_status=os;
+	console.getkey();
+}
+else {
+        if (ouah) {
+	  // Last few callers
+	  console.aborted=false;
+	  console.clear();
+	  logonlst=system.data_dir + "logon.lst"
+	  if(file_size(logonlst)<1)
+		printf("\1n\1g\1hYou are the first caller of the day!\r\n");
+	  else {
+		printf("\1n\1g\1hLast few callers:\1n\r\n");
+		console.printtail(logonlst,4,P_NOATCODES);      // args: filename, lines, mode
+	  }
+	  console.crlf();
+
+	  // Auto-message
+	  auto_msg=system.data_dir + "msgs/auto.msg"
+	  if(file_size(auto_msg)>0) {
+		console.printfile(auto_msg,P_NOATCODES);
+		console.crlf();
+	  }
+        }
+}
+
+// Automatically set shell to WIPSHELL
+if(user.settings&USER_WIP)
+	user.command_shell="WIPSHELL";
+
+if(user.security.level==99				/* Sysop logging on */
+	&& !system.matchuser("guest")		/* Guest account does not yet exist */
+	&& user.security.flags4&UFLAG_G		/* Sysop has not asked to stop this question */
+	) {
+	if(console.yesno("Create Guest/Anonymous user account (highly recommended)"))
+		load("makeguest.js");
+	else if(!console.yesno("Ask again later"))
+		user.security.flags4&=~UFLAG_G;	/* Turn off flag 4G to not ask again */
+	console.crlf();
+}
+
+// Set rlogin_xtrn_menu=true in [logon] section of ctrl/modopts.ini
+// if you want your RLogin server to act as a door game server only
+if(options
+	&& options.rlogin_xtrn_menu
+	&& bbs.sys_status&SS_RLOGIN) {
+	bbs.xtrn_sec();
+	bbs.hangup();
+}