summaryrefslogtreecommitdiffstats
path: root/mbbsd/mail.c
diff options
context:
space:
mode:
authorptt <ptt@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2004-06-26 10:03:37 +0800
committerptt <ptt@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2004-06-26 10:03:37 +0800
commit450ad26421aa1c38700dddc8899a3522e1cc5442 (patch)
tree92cd9e2cacca48bb627263c985b69f84037081d5 /mbbsd/mail.c
parent42d9500f4b43e6f6c5680d1a2fd5065164698d1f (diff)
downloadpttbbs-450ad26421aa1c38700dddc8899a3522e1cc5442.tar
pttbbs-450ad26421aa1c38700dddc8899a3522e1cc5442.tar.gz
pttbbs-450ad26421aa1c38700dddc8899a3522e1cc5442.tar.bz2
pttbbs-450ad26421aa1c38700dddc8899a3522e1cc5442.tar.lz
pttbbs-450ad26421aa1c38700dddc8899a3522e1cc5442.tar.xz
pttbbs-450ad26421aa1c38700dddc8899a3522e1cc5442.tar.zst
pttbbs-450ad26421aa1c38700dddc8899a3522e1cc5442.zip
Merge bbs merge moduleptt.fpg@2092
usage: make -D BBSMERGE to enable this module git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@2091 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
Diffstat (limited to 'mbbsd/mail.c')
-rw-r--r--mbbsd/mail.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/mbbsd/mail.c b/mbbsd/mail.c
index bb98674c..506d8c38 100644
--- a/mbbsd/mail.c
+++ b/mbbsd/mail.c
@@ -743,6 +743,7 @@ read_new_mail(fileheader_t * fptr)
if (genbuf[0] == 'y') {
unlink(fname);
delmsgs[delcnt++] = idc; // FIXME 一次刪太多信 out of array boundary
+ mailsum = mailkeep = 0;
}
}
clear();
@@ -838,6 +839,7 @@ mail_del(int ent, fileheader_t * fhdr, char *direct)
setupmailusage();
setdirpath(genbuf, direct, fhdr->filename);
unlink(genbuf);
+ mailsum = mailkeep = 0;
return DIRCHANGED;
}
}
@@ -1122,18 +1124,15 @@ int
mail_man()
{
char buf[64], buf1[64];
- if (HAS_PERM(PERM_MAILLIMIT)) {
- int mode0 = currutmp->mode;
- int stat0 = currstat;
+ int mode0 = currutmp->mode;
+ int stat0 = currstat;
sethomeman(buf, cuser.userid);
snprintf(buf1, sizeof(buf1), "%s 的信件夾", cuser.userid);
- a_menu(buf1, buf, 1);
+ a_menu(buf1, buf, HAS_PERM(PERM_MAILLIMIT));
currutmp->mode = mode0;
currstat = stat0;
return FULLUPDATE;
- }
- return DONOTHING;
}
static int