diff --git a/src/sbbs3/download.cpp b/src/sbbs3/download.cpp index 1160c5512234ff12214e1c50425d7973ea8f782c..b247a9a8205fe2e0f64342002e70683ae82e735f 100644 --- a/src/sbbs3/download.cpp +++ b/src/sbbs3/download.cpp @@ -83,19 +83,19 @@ void sbbs_t::downloadfile(file_t* f) mod=((ulong)(l*(cfg.dir[f->dir]->dn_pct/100.0))/cur_cps)/60; adjustuserrec(&cfg,i,U_MIN,10,mod); sprintf(tmp,"%lu minute",mod); - sprintf(str,text[DownloadUserMsg] - ,!strcmp(cfg.dir[f->dir]->code,"TEMP") ? temp_file : f->name - ,!strcmp(cfg.dir[f->dir]->code,"TEMP") ? text[Partially] : nulstr - ,useron.alias,tmp); } - else { + } else { mod=(ulong)(l*(cfg.dir[f->dir]->dn_pct/100.0)); adjustuserrec(&cfg,i,U_CDT,10,mod); ultoac(mod,tmp); + } + if(!(cfg.dir[f->dir]->misc&DIR_QUIET)) { sprintf(str,text[DownloadUserMsg] ,!strcmp(cfg.dir[f->dir]->code,"TEMP") ? temp_file : f->name ,!strcmp(cfg.dir[f->dir]->code,"TEMP") ? text[Partially] : nulstr - ,useron.alias,tmp); } - putsmsg(&cfg,i,str); } + ,useron.alias,tmp); + putsmsg(&cfg,i,str); + } + } /*******************/ /* Update IXB File */ /*******************/ diff --git a/src/sbbs3/ftpsrvr.c b/src/sbbs3/ftpsrvr.c index bc1d89340308cca7f5869151aff00b3188f290e8..f26d03677ad236c1f4c14579d647f4b954238cde 100644 --- a/src/sbbs3/ftpsrvr.c +++ b/src/sbbs3/ftpsrvr.c @@ -1534,12 +1534,14 @@ static void send_thread(void* arg) adjustuserrec(&scfg,uploader.number,U_CDT,10,mod); ultoac(mod,tmp); } - /* Inform uploader of downloaded file */ - sprintf(str,text[DownloadUserMsg] - ,getfname(xfer.filename) - ,xfer.filepos ? "partially FTP-" : "FTP-" - ,xfer.user->alias,tmp); - putsmsg(&scfg,uploader.number,str); + if(!(scfg.dir[f.dir]->misc&DIR_QUIET)) { + /* Inform uploader of downloaded file */ + sprintf(str,text[DownloadUserMsg] + ,getfname(xfer.filename) + ,xfer.filepos ? "partially FTP-" : "FTP-" + ,xfer.user->alias,tmp); + putsmsg(&scfg,uploader.number,str); + } } } /* Need to update datedled in index */ diff --git a/src/sbbs3/sbbsdefs.h b/src/sbbs3/sbbsdefs.h index cc8860ad4d7594c465e4342fddcb0a3ec087ab40..d2788f92d393126b9ab17dec1d906f349217ae5d 100644 --- a/src/sbbs3/sbbsdefs.h +++ b/src/sbbs3/sbbsdefs.h @@ -279,6 +279,7 @@ #define DIR_CDTMIN (1L<<15) /* Give uploader minutes instead of cdt */ #define DIR_SINCEDL (1L<<16) /* Purge based on days since last dl */ #define DIR_MOVENEW (1L<<17) /* Files marked as new when moved */ +#define DIR_QUIET (1L<<18) /* Do not notify uploader of downloads */ /* Bit values for file_t.misc */ #define FM_EXTDESC (1<<0) /* Extended description exists */