Commit f35d8a66 authored by rswindell's avatar rswindell
Browse files

The feature added in rev 1.67 (Feb-20-2019) was a bit broken in that if a

reply-message was passed in (remsg), the subject copied from that header
was not actually used in subsequent call to qnetmail(). Since we're passing
the remsg down to inetmail(), that didn't seem to make a difference, but
passing down the copied subject field to that function too for good measure.
This bug broke QWKnet replies using the bbs.netmail() JS function call.
parent 348f2214
...@@ -158,7 +158,7 @@ bool sbbs_t::netmail(const char *into, const char *title, long mode, smb_t* resm ...@@ -158,7 +158,7 @@ bool sbbs_t::netmail(const char *into, const char *title, long mode, smb_t* resm
bputs(text[EmailFilesNotAllowed]); bputs(text[EmailFilesNotAllowed]);
mode&=~WM_FILE; mode&=~WM_FILE;
} }
return qnetmail(to, title, mode, resmb, remsg); return qnetmail(to, subj, mode, resmb, remsg);
} }
if(net_type == NET_INTERNET) { if(net_type == NET_INTERNET) {
if(!(cfg.inetmail_misc&NMAIL_ALLOW)) { if(!(cfg.inetmail_misc&NMAIL_ALLOW)) {
...@@ -169,7 +169,7 @@ bool sbbs_t::netmail(const char *into, const char *title, long mode, smb_t* resm ...@@ -169,7 +169,7 @@ bool sbbs_t::netmail(const char *into, const char *title, long mode, smb_t* resm
bputs(text[EmailFilesNotAllowed]); bputs(text[EmailFilesNotAllowed]);
mode&=~WM_FILE; mode&=~WM_FILE;
} }
return inetmail(to, title, mode, resmb, remsg); return inetmail(to, subj, mode, resmb, remsg);
} }
p=strrchr(to,'@'); /* Find '@' in name@addr */ p=strrchr(to,'@'); /* Find '@' in name@addr */
if(p==NULL || net_type != NET_FIDO) { if(p==NULL || net_type != NET_FIDO) {
...@@ -281,7 +281,7 @@ bool sbbs_t::netmail(const char *into, const char *title, long mode, smb_t* resm ...@@ -281,7 +281,7 @@ bool sbbs_t::netmail(const char *into, const char *title, long mode, smb_t* resm
if(x<cfg.total_prots) /* This should be always */ if(x<cfg.total_prots) /* This should be always */
protocol(cfg.prot[x],XFER_UPLOAD,subj,nulstr,true); protocol(cfg.prot[x],XFER_UPLOAD,subj,nulstr,true);
} }
sprintf(tmp,"%s%s",cfg.temp_dir,title); sprintf(tmp,"%s%s",cfg.temp_dir,subj);
if(!fexistcase(subj) && fexistcase(tmp)) if(!fexistcase(subj) && fexistcase(tmp))
mv(tmp,subj,0); mv(tmp,subj,0);
l=(long)flength(subj); l=(long)flength(subj);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment