From b79cf652947662583ff07967e64aed6fa38a1971 Mon Sep 17 00:00:00 2001
From: rswindell <>
Date: Thu, 21 Oct 2004 08:43:33 +0000
Subject: [PATCH] Eliminate a few remaining forced upper/lower (proper) cased
string inputs, if so configured in SCFG->System->New User Values->Question
Toggles.
---
src/sbbs3/bulkmail.cpp | 2 +-
src/sbbs3/logon.cpp | 11 ++++++++---
src/sbbs3/readmail.cpp | 2 +-
src/sbbs3/upload.cpp | 2 +-
4 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/sbbs3/bulkmail.cpp b/src/sbbs3/bulkmail.cpp
index 19db65ecb6..00f5243bf1 100644
--- a/src/sbbs3/bulkmail.cpp
+++ b/src/sbbs3/bulkmail.cpp
@@ -139,7 +139,7 @@ bool sbbs_t::bulkmail(uchar *ar)
else
while(online) {
bputs(text[EnterAfterLastDestUser]);
- if(!getstr(str,LEN_ALIAS,K_UPRLWR))
+ if(!getstr(str,LEN_ALIAS,cfg.uq&UQ_NOUPRLWR ? K_NONE:K_UPRLWR))
break;
if((i=finduser(str))!=0) {
if((x=bulkmailhdr(&smb, &msg, i))!=SMB_SUCCESS) {
diff --git a/src/sbbs3/logon.cpp b/src/sbbs3/logon.cpp
index 345a56474a..0e1cc077e0 100644
--- a/src/sbbs3/logon.cpp
+++ b/src/sbbs3/logon.cpp
@@ -50,6 +50,7 @@ bool sbbs_t::logon()
char tmp[512];
int file;
uint i,j,mailw;
+ long kmode;
ulong totallogons;
node_t node;
struct tm tm;
@@ -315,6 +316,10 @@ bool sbbs_t::logon()
hangup();
return(false);
}
+ kmode=(cfg.uq&UQ_NOEXASC);
+ if(!(cfg.uq&UQ_NOUPRLWR))
+ kmode|=K_UPRLWR;
+
if(!(useron.rest&FLAG('G'))) {
if(!useron.name[0] && ((cfg.uq&UQ_ALIASES && cfg.uq&UQ_REALNAME)
|| cfg.uq&UQ_COMPANY))
@@ -323,7 +328,7 @@ bool sbbs_t::logon()
bputs(text[EnterYourRealName]);
else
bputs(text[EnterYourCompany]);
- getstr(useron.name,LEN_NAME,K_UPRLWR|(cfg.uq&UQ_NOEXASC));
+ getstr(useron.name,LEN_NAME,kmode);
if(cfg.uq&UQ_ALIASES && cfg.uq&UQ_REALNAME) {
if(trashcan(useron.name,"name") || !useron.name[0]
|| !strchr(useron.name,' ')
@@ -357,13 +362,13 @@ bool sbbs_t::logon()
if(cfg.uq&UQ_LOCATION && !useron.location[0])
while(online) {
bputs(text[EnterYourCityState]);
- if(getstr(useron.location,LEN_LOCATION,K_UPRLWR|(cfg.uq&UQ_NOEXASC)))
+ if(getstr(useron.location,LEN_LOCATION,kmode))
break;
}
if(cfg.uq&UQ_ADDRESS && !useron.address[0])
while(online) {
bputs(text[EnterYourAddress]);
- if(getstr(useron.address,LEN_ADDRESS,K_UPRLWR|(cfg.uq&UQ_NOEXASC)))
+ if(getstr(useron.address,LEN_ADDRESS,kmode))
break;
}
if(cfg.uq&UQ_ADDRESS && !useron.zipcode[0])
diff --git a/src/sbbs3/readmail.cpp b/src/sbbs3/readmail.cpp
index 9a6fad8e67..7c366bcc15 100644
--- a/src/sbbs3/readmail.cpp
+++ b/src/sbbs3/readmail.cpp
@@ -436,7 +436,7 @@ void sbbs_t::readmail(uint usernumber, int which)
case 'F': /* Forward last piece */
domsg=0;
bputs(text[ForwardMailTo]);
- if(!getstr(str,LEN_ALIAS,K_UPRLWR))
+ if(!getstr(str,LEN_ALIAS,cfg.uq&UQ_NOUPRLWR ? K_NONE:K_UPRLWR))
break;
i=finduser(str);
if(!i)
diff --git a/src/sbbs3/upload.cpp b/src/sbbs3/upload.cpp
index c8b033942d..b23ee12f74 100644
--- a/src/sbbs3/upload.cpp
+++ b/src/sbbs3/upload.cpp
@@ -370,7 +370,7 @@ bool sbbs_t::upload(uint dirnum)
bputs(text[EnterAfterLastDestUser]);
while((!dir_op(dirnum) && destusers<cfg.max_userxfer) || destusers<MAX_USERXFER) {
bputs(text[SendFileToUser]);
- if(!getstr(str,LEN_ALIAS,K_UPRLWR))
+ if(!getstr(str,LEN_ALIAS,cfg.uq&UQ_NOUPRLWR ? K_NONE:K_UPRLWR))
break;
if((user.number=finduser(str))!=0) {
if(!dir_op(dirnum) && user.number==useron.number) {
--
GitLab