diff --git a/src/sbbs3/email.cpp b/src/sbbs3/email.cpp index 6afeb86e4562180db04ff6e04a9675584efff7ef..4ec7a9936534bbdf392e146b8e1e18b2ed05c8d1 100644 --- a/src/sbbs3/email.cpp +++ b/src/sbbs3/email.cpp @@ -92,7 +92,7 @@ bool sbbs_t::email(int usernumber, const char *top, const char *subj, long mode) if((l&NETMAIL) && (cfg.sys_misc&SM_FWDTONET)) { getuserrec(&cfg,usernumber,U_NETMAIL,LEN_NETMAIL,str); bprintf(text[UserNetMail],str); - if(usernumber==cfg.node_valuser || text[ForwardMailQ][0]==0 || yesno(text[ForwardMailQ])) /* Forward to netmail address */ + if((mode & WM_FORCEFWD) || text[ForwardMailQ][0]==0 || yesno(text[ForwardMailQ])) /* Forward to netmail address */ return(netmail(str,subj,mode)); } bprintf(text[Emailing],username(&cfg,usernumber,tmp),usernumber); diff --git a/src/sbbs3/newuser.cpp b/src/sbbs3/newuser.cpp index a711d1f50b4f7d56cc9826145deb6b8e8ae47777..b425d5293af1a11df46fad88a655ddbe2dd106f3 100644 --- a/src/sbbs3/newuser.cpp +++ b/src/sbbs3/newuser.cpp @@ -461,11 +461,11 @@ BOOL sbbs_t::newuser() safe_snprintf(str,sizeof(str),text[NewUserFeedbackHdr] ,nulstr,getage(&cfg,useron.birth),useron.sex,useron.birth ,useron.name,useron.phone,useron.comp,useron.modem); - email(cfg.node_valuser,str,"New User Validation",WM_EMAIL|WM_SUBJ_RO); + email(cfg.node_valuser,str,"New User Validation",WM_EMAIL|WM_SUBJ_RO|WM_FORCEFW); if(!useron.fbacks && !useron.emails) { if(online) { /* didn't hang up */ bprintf(text[NoFeedbackWarning],username(&cfg,cfg.node_valuser,tmp)); - email(cfg.node_valuser,str,"New User Validation",WM_EMAIL|WM_SUBJ_RO); + email(cfg.node_valuser,str,"New User Validation",WM_EMAIL|WM_SUBJ_RO|WM_FORCEFW); } /* give 'em a 2nd try */ if(!useron.fbacks && !useron.emails) { bprintf(text[NoFeedbackWarning],username(&cfg,cfg.node_valuser,tmp)); diff --git a/src/sbbs3/sbbsdefs.h b/src/sbbs3/sbbsdefs.h index d10399bf3f68ea5fe6638075eaf89a81bdc8fef4..c573f2735156cccef4f5cf32fcef5846b527d342 100644 --- a/src/sbbs3/sbbsdefs.h +++ b/src/sbbs3/sbbsdefs.h @@ -724,6 +724,7 @@ typedef enum { /* Values for xtrn_t.event */ #define WM_PRIVATE (1<<8) /* Private (for creating MSGINF file) */ #define WM_SUBJ_RO (1<<9) /* Subject/title is read-only */ #define WM_EDIT (1<<10) /* Editing existing message */ +#define WM_FORCEFWD (1<<11) /* Force "yes" to ForwardMailQ for email */ /* Bits in the mode of loadposts() */ #define LP_BYSELF (1<<0) /* Include messages sent by self */