diff options
author | kcwu <kcwu@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2005-03-15 04:33:47 +0800 |
---|---|---|
committer | kcwu <kcwu@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2005-03-15 04:33:47 +0800 |
commit | 026329f85c6ebcbec743d526a0c46bd1c0aab8bb (patch) | |
tree | 6f76835cc10bfa49f943a50f5c3db9d36c6c2459 /mbbsd/mail.c | |
parent | b26fbc65ed9d7cbca50f8758712a9b9b6b2bf853 (diff) | |
download | pttbbs-026329f85c6ebcbec743d526a0c46bd1c0aab8bb.tar pttbbs-026329f85c6ebcbec743d526a0c46bd1c0aab8bb.tar.gz pttbbs-026329f85c6ebcbec743d526a0c46bd1c0aab8bb.tar.bz2 pttbbs-026329f85c6ebcbec743d526a0c46bd1c0aab8bb.tar.lz pttbbs-026329f85c6ebcbec743d526a0c46bd1c0aab8bb.tar.xz pttbbs-026329f85c6ebcbec743d526a0c46bd1c0aab8bb.tar.zst pttbbs-026329f85c6ebcbec743d526a0c46bd1c0aab8bb.zip |
warning: searchuser() getuser() API change, don't change query string implicitly.
git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@2627 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
Diffstat (limited to 'mbbsd/mail.c')
-rw-r--r-- | mbbsd/mail.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/mbbsd/mail.c b/mbbsd/mail.c index 82263f74..9fb5ecca 100644 --- a/mbbsd/mail.c +++ b/mbbsd/mail.c @@ -66,7 +66,7 @@ mailalert(char *userid) userinfo_t *uentp = NULL; int n, tuid, i; - if ((tuid = searchuser(userid)) == 0) + if ((tuid = searchuser(userid, NULL)) == 0) return -1; n = count_logins(tuid, 0); @@ -357,7 +357,7 @@ multi_list(int *reciper) move(2, 0); clrtoeol(); - if (!searchuser(uid)) + if (!searchuser(uid, uid)) outs(err_uid); else if (!InNameList(uid)) { AddNameList(uid); @@ -435,7 +435,7 @@ multi_send(char *title) if (listing) { strtok(ptr = genbuf + 3, " \n\r"); do { - if (searchuser(ptr) && !InNameList(ptr) && + if (searchuser(ptr, ptr) && !InNameList(ptr) && strcmp(cuser.userid, ptr)) { AddNameList(ptr); reciper++; @@ -502,7 +502,7 @@ multi_send(char *title) outc(' '); } outs(p->word); - if (searchuser(p->word) && strcmp(STR_GUEST, p->word)) + if (searchuser(p->word, p->word) && strcmp(STR_GUEST, p->word)) sethomepath(genbuf, p->word); else continue; @@ -1417,20 +1417,21 @@ send_inner_mail(char *fpath, char *title, char *receiver) { char genbuf[256]; fileheader_t mymail; + char rightid[IDLEN+1]; - if (!searchuser(receiver)) + if (!searchuser(receiver, rightid)) return -2; /* to avoid DDOS of disk */ - sethomedir(genbuf, receiver); + sethomedir(genbuf, rightid); // XXX should we use MAX_EXKEEPMAIL instead? if (dashs(genbuf) >= 2048 * sizeof(fileheader_t)) { return -2; } - sethomepath(genbuf, receiver); + sethomepath(genbuf, rightid); stampfile(genbuf, &mymail); - if (!strcmp(receiver, cuser.userid)) { + if (!strcmp(rightid, cuser.userid)) { strlcpy(mymail.owner, "[" BBSNAME "]", sizeof(mymail.owner)); mymail.filemode = FILE_READ; } else @@ -1438,7 +1439,7 @@ send_inner_mail(char *fpath, char *title, char *receiver) strncpy(mymail.title, title, TTLEN); unlink(genbuf); Copy(fpath, genbuf); - sethomedir(genbuf, receiver); + sethomedir(genbuf, rightid); return append_record_forward(genbuf, &mymail, sizeof(mymail)); } |