diff --git a/src/sbbs3/mail.cpp b/src/sbbs3/mail.cpp
index c1c752bf9d2c7d850fa761eec9272a0d8d925540..1e82aa860da7026110b7f724af07de857555f441 100644
--- a/src/sbbs3/mail.cpp
+++ b/src/sbbs3/mail.cpp
@@ -38,7 +38,7 @@
/****************************************************************************/
/* Removes all mail messages for usernumber that have been marked 'deleted' */
/* smb_locksmbhdr() should be called prior to this function */
-/* Returns the nubmer of messages removed */
+/* Returns the number of messages removed */
/****************************************************************************/
int sbbs_t::delmail(uint usernumber, int which)
{
@@ -82,6 +82,10 @@ int sbbs_t::delmail(uint usernumber, int which)
if(smb.status.max_age && (now<0?0:(uintmax_t)now)>msg.idx.time
&& (now-msg.idx.time)/(24L*60L*60L)>smb.status.max_age)
msg.idx.attr|=MSG_DELETE;
+ else if((msg.idx.attr&MSG_SPAM)
+ && cfg.max_spamage && (now<0?0:(uintmax_t)now) > msg.idx.time
+ && (now-msg.idx.time)/(24L*60L*60L) > cfg.max_spamage)
+ msg.idx.attr|=MSG_DELETE;
else if(msg.idx.attr&MSG_KILLREAD && msg.idx.attr&MSG_READ)
msg.idx.attr|=MSG_DELETE;
if(msg.idx.attr&MSG_DELETE) {
diff --git a/src/sbbs3/scfg/scfgmsg.c b/src/sbbs3/scfg/scfgmsg.c
index 95c05f58a10d8a2fdb7fed8cf456a85e0851a6e1..cff0a1fadebd83618e97b0585b2de888f49d9731 100644
--- a/src/sbbs3/scfg/scfgmsg.c
+++ b/src/sbbs3/scfg/scfgmsg.c
@@ -468,6 +468,7 @@ void msgs_cfg()
"networked sub-boards. One might have a `Local` message group that contains\n"
"non-networked sub-boards of various topics and also have a `FidoNet`\n"
"message group that contains sub-boards that are echoed across FidoNet.\n"
+ "\n"
"Some sysops separate sub-boards into more specific areas such as `Main`,\n"
"`Technical`, or `Adult`. If you have many sub-boards that have a common\n"
"subject denominator, you may want to have a separate message group for\n"
@@ -1000,6 +1001,11 @@ void msg_opts()
else
strcpy(str,"Disabled");
sprintf(opt[i++],"%-33.33s%s","Purge E-mail by Age",str);
+ if(cfg.max_spamage)
+ sprintf(str,"Enabled (%u days old)",cfg.max_spamage);
+ else
+ strcpy(str,"Disabled");
+ sprintf(opt[i++],"%-33.33s%s","Purge SPAM by Age",str);
if(cfg.sys_misc&SM_DELEMAIL)
strcpy(str,"Immediately");
else
@@ -1034,7 +1040,7 @@ void msg_opts()
"`Message Options:`\n"
"\n"
"This is a menu of system-wide message related options. Messages include\n"
- "E-mail and public posts (on sub-boards).\n"
+ "private E-mail and public posts in public message areas, sub-boards.\n"
;
switch(uifc.list(WIN_ORG|WIN_ACT|WIN_MID|WIN_CHE,0,0,72,&msg_dflt,0
@@ -1134,15 +1140,28 @@ void msg_opts()
case 5:
sprintf(str,"%u",cfg.mail_maxage);
uifc.helpbuf=
- "`Maximum Age of Mail:`\n"
+ "`Maximum Age of E-mail:`\n"
"\n"
- "This value is the maximum number of days that mail will be kept.\n"
+ "This value is the maximum number of days that E-mail will be kept (read\n"
+ "or not). Use `0` for `unlimited`.\n"
;
- uifc.input(WIN_MID|WIN_SAV,0,17,"Maximum Age of Mail "
+ uifc.input(WIN_MID|WIN_SAV,0,17,"Maximum Age of E-mail "
"(in days)",str,5,K_EDIT|K_NUMBER);
cfg.mail_maxage=atoi(str);
break;
case 6:
+ sprintf(str,"%u",cfg.max_spamage);
+ uifc.helpbuf=
+ "`Maximum Age of SPAM:`\n"
+ "\n"
+ "This value is the maximum number of days that SPAM-tagged E-mail will be\n"
+ "kept (read or not). Use `0` for `unlimited`.\n"
+ ;
+ uifc.input(WIN_MID|WIN_SAV,0,17,"Maximum Age of SPAM-tagged E-mail "
+ "(in days)",str,5,K_EDIT|K_NUMBER);
+ cfg.max_spamage=atoi(str);
+ break;
+ case 7:
strcpy(opt[0],"Daily");
strcpy(opt[1],"Immediately");
opt[2][0]=0;
@@ -1171,20 +1190,20 @@ void msg_opts()
uifc.changes=1;
}
break;
- case 7:
+ case 8:
sprintf(str,"%"PRIu32,cfg.mail_maxcrcs);
uifc.helpbuf=
- "`Maximum Number of Mail CRCs:`\n"
+ "`Maximum Number of E-mail CRCs:`\n"
"\n"
"This value is the maximum number of CRCs that will be kept for duplicate\n"
"mail checking. Once this maximum number of CRCs is reached, the oldest\n"
"CRCs will be automatically purged.\n"
;
- uifc.input(WIN_MID|WIN_SAV,0,17,"Maximum Number of Mail "
+ uifc.input(WIN_MID|WIN_SAV,0,17,"Maximum Number of E-mail "
"CRCs",str,5,K_EDIT|K_NUMBER);
cfg.mail_maxcrcs=atol(str);
break;
- case 8:
+ case 9:
strcpy(opt[0],"Yes");
strcpy(opt[1],"No");
opt[2][0]=0;
@@ -1207,7 +1226,7 @@ void msg_opts()
uifc.changes=1;
}
break;
- case 9:
+ case 10:
strcpy(opt[0],"Yes");
strcpy(opt[1],"No");
opt[2][0]=0;
@@ -1230,7 +1249,7 @@ void msg_opts()
uifc.changes=1;
}
break;
- case 10:
+ case 11:
strcpy(opt[0],"Yes");
strcpy(opt[1],"No");
opt[2][0]=0;
@@ -1253,7 +1272,7 @@ void msg_opts()
uifc.changes=1;
}
break;
- case 11:
+ case 12:
strcpy(opt[0],"Yes");
strcpy(opt[1],"No");
opt[2][0]=0;
@@ -1277,7 +1296,7 @@ void msg_opts()
uifc.changes=1;
}
break;
- case 12:
+ case 13:
strcpy(opt[0],"Yes");
strcpy(opt[1],"No");
opt[2][0]=0;
@@ -1300,7 +1319,7 @@ void msg_opts()
uifc.changes=1;
}
break;
- case 13:
+ case 14:
strcpy(opt[0],"Yes");
strcpy(opt[1],"No");
opt[2][0]=0;
@@ -1323,7 +1342,7 @@ void msg_opts()
uifc.changes=1;
}
break;
- case 14:
+ case 15:
n=(cfg.sub[i]->misc&MM_EMAILSIG) ? 0:1;
strcpy(opt[0],"Yes");
strcpy(opt[1],"No");
@@ -1348,7 +1367,7 @@ void msg_opts()
cfg.msg_misc&=~MM_EMAILSIG;
}
break;
- case 15:
+ case 16:
strcpy(opt[0],"Yes");
strcpy(opt[1],"No");
strcpy(opt[2],"Sysops Only");
@@ -1387,7 +1406,7 @@ void msg_opts()
uifc.changes=1;
}
break;
- case 16:
+ case 17:
uifc.helpbuf=
"`Days of New Messages for Guest:`\n"
"\n"
@@ -1402,7 +1421,7 @@ void msg_opts()
,str,4,K_EDIT|K_NUMBER);
cfg.guest_msgscan_init=atoi(str);
break;
- case 17:
+ case 18:
uifc.helpbuf=
"`Extra Attribute Codes...`\n"
"\n"
diff --git a/src/sbbs3/scfgdefs.h b/src/sbbs3/scfgdefs.h
index f3c10d026b948a9d8322a6b779400bdb44ec8008..4aeff2a3efd3a7e74c6c90d6fbe87d0476d0f77b 100644
--- a/src/sbbs3/scfgdefs.h
+++ b/src/sbbs3/scfgdefs.h
@@ -536,6 +536,7 @@ typedef struct
uint32_t max_minutes; /* Maximum minutes a user can have */
uint32_t max_qwkmsgs; /* Maximum messages per QWK packet */
uint16_t max_qwkmsgage; /* Maximum age (in days) of QWK messages to be imported */
+ uint16_t max_spamage; /* Maximum age (in days) of SPAM-tagged messages */
char preqwk_arstr[LEN_ARSTR+1]; /* pre pack QWK */
uchar* preqwk_ar;
uint16_t cdt_min_value; /* Minutes per 100k credits */
diff --git a/src/sbbs3/scfglib1.c b/src/sbbs3/scfglib1.c
index ea1025a82ff6b260ba170e312934666c98859729..f0c007d052f5ca21a0f24352157b70c787b68307 100644
--- a/src/sbbs3/scfglib1.c
+++ b/src/sbbs3/scfglib1.c
@@ -441,7 +441,8 @@ BOOL read_msgs_cfg(scfg_t* cfg, char* error)
if(!cfg->smb_retry_time)
cfg->smb_retry_time=30;
get_int(cfg->max_qwkmsgage, instream);
- for(i=0;i<233;i++) /* NULL */
+ get_int(cfg->max_spamage, instream);
+ for(i=0;i<232;i++) /* NULL */
get_int(n,instream);
get_int(cfg->msg_misc,instream);
for(i=0;i<255;i++) /* 0xff */
diff --git a/src/sbbs3/scfgsave.c b/src/sbbs3/scfgsave.c
index 508edc3901331cc873623ffde7b70bb5c064cc32..7868a441dd4fa8244ef2bd9f3d0ddb31b602b0ba 100644
--- a/src/sbbs3/scfgsave.c
+++ b/src/sbbs3/scfgsave.c
@@ -362,8 +362,9 @@ BOOL DLLCALL write_msgs_cfg(scfg_t* cfg, int backup_level)
put_str(cfg->preqwk_arstr,stream);
put_int(cfg->smb_retry_time,stream);
put_int(cfg->max_qwkmsgage,stream);
+ put_int(cfg->max_spamage,stream);
n=0;
- for(i=0;i<233;i++)
+ for(i=0;i<232;i++)
put_int(n,stream);
put_int(cfg->msg_misc,stream);
n=0xffff;