Merge remote-tracking branch 'origin/master' into new_user_dat

exec/newuser.js

@@ -36,9 +36,11 @@ if(!user.address.length && user.number>1 && options.survey !== false) {
 if(options.ask_qnet) {
 	if(options.qnet_name==undefined)
 		options.qnet_name="DOVE-Net";
-	if(!console.noyes(format("\r\nIs this account to be used for QWK Networking (%s)\1b", options.qnet_name))
-		&& !console.noyes("\r\n\1bARE YOU \1wPOSITIVE\1n\1h\1b (If you're unsure, press '\1wN\1b')"))
-		qnet=true;
+	if(!console.noyes(format("\r\nIs this account to be used for QWK Networking (%s)\1b", options.qnet_name))) {
+		alert("\r\nThis acount will ONLY be useful for QWK Networking activities!");
+		if(!console.noyes("\r\n\1bARE YOU \1wPOSITIVE\1n\1h\1b (If you're unsure, press '\1wN\1b')"))
+			qnet=true;
+	}
 }
 
 if(!qnet && (options.avatar || options.avatar_file)) {

src/sbbs3/newuser.cpp

@@ -264,11 +264,13 @@ BOOL sbbs_t::newuser()
 		if(!online) return(FALSE);
 		while((cfg.uq&UQ_LOCATION) && online && text[EnterYourCityState][0]) {
 			bputs(text[EnterYourCityState]);
-			if(getstr(useron.location,LEN_LOCATION,kmode)
-				&& ((cfg.uq&UQ_NOCOMMAS) || strchr(useron.location,',')))
+			if(getstr(useron.location,LEN_LOCATION,kmode) < 1)
+				continue;
+			if((cfg.uq&UQ_NOCOMMAS) && strchr(useron.location,',') == NULL) {
+				bputs(text[CommaInLocationRequired]);
+				useron.location[0]=0;
+			} else
 				break;
-			bputs(text[CommaInLocationRequired]);
-			useron.location[0]=0; 
 		}
 		if(cfg.uq&UQ_ADDRESS)
 			while(online && text[EnterYourZipCode][0]) {