Synchronet now requires the libarchive development package (e.g. libarchive-dev on Debian-based Linux distros, libarchive.org for more info) to build successfully.

Commit 90f3094a authored by rswindell's avatar rswindell

Fix (likely new) bug where QWK netmail could not be quoted when replying.

parent 50186717
......@@ -157,7 +157,7 @@ bool sbbs_t::netmail(const char *into, const char *title, long mode, smb_t* resm
bputs(text[EmailFilesNotAllowed]);
mode&=~WM_FILE;
}
qnetmail(to, title, mode);
qnetmail(to, title, mode, resmb, remsg);
return false;
}
if(net_type == NET_INTERNET) {
......
......@@ -316,7 +316,7 @@ bool sbbs_t::inetmail(const char *into, const char *subj, long mode, smb_t* resm
return(true);
}
bool sbbs_t::qnetmail(const char *into, const char *subj, long mode)
bool sbbs_t::qnetmail(const char *into, const char *subj, long mode, smb_t* resmb, smbmsg_t* remsg)
{
char str[256],msgpath[128],fulladdr[128]
,buf[SDT_BLOCK_LEN],*addr;
......@@ -370,6 +370,11 @@ bool sbbs_t::qnetmail(const char *into, const char *subj, long mode)
action=NODE_SMAL;
nodesync();
if(remsg != NULL && resmb != NULL && !(mode&WM_QUOTE)) {
if(quotemsg(resmb, remsg, /* include tails: */true))
mode |= WM_QUOTE;
}
SAFEPRINTF(msgpath,"%snetmail.msg",cfg.node_dir);
if(!writemsg(msgpath,nulstr,title, (mode|WM_QWKNET|WM_NETMAIL) ,INVALID_SUB,to,/* from: */useron.alias,&editor)) {
bputs(text[Aborted]);
......
......@@ -981,7 +981,7 @@ public:
bool lookup_netuser(char *into);
bool inetmail(const char *into, const char *subj = NULL, long mode = WM_NONE, smb_t* resmb = NULL, smbmsg_t* remsg = NULL);
bool qnetmail(const char *into, const char *subj = NULL, long mode = WM_NONE);
bool qnetmail(const char *into, const char *subj = NULL, long mode = WM_NONE, smb_t* resmb = NULL, smbmsg_t* remsg = NULL);
/* useredit.cpp */
void useredit(int usernumber);
......
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