diff options
| author | victor <victor@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2003-08-28 10:33:52 +0800 |
|---|---|---|
| committer | victor <victor@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2003-08-28 10:33:52 +0800 |
| commit | 543f462a14136e83b8f96f3c7d44f3b5d36cd2a2 (patch) | |
| tree | 981f90a5cb8dcde5b031166a1097552c88448631 | |
| parent | c532c77faf0cbe0b289102e4d853adff0890e25c (diff) | |
| download | pttbbs-543f462a14136e83b8f96f3c7d44f3b5d36cd2a2.tar pttbbs-543f462a14136e83b8f96f3c7d44f3b5d36cd2a2.tar.gz pttbbs-543f462a14136e83b8f96f3c7d44f3b5d36cd2a2.tar.bz2 pttbbs-543f462a14136e83b8f96f3c7d44f3b5d36cd2a2.tar.lz pttbbs-543f462a14136e83b8f96f3c7d44f3b5d36cd2a2.tar.xz pttbbs-543f462a14136e83b8f96f3c7d44f3b5d36cd2a2.tar.zst pttbbs-543f462a14136e83b8f96f3c7d44f3b5d36cd2a2.zip | |
wrong spell and missing :P
git-svn-id: http://opensvn.csie.org/pttbbs/trunk@1135 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
| -rw-r--r-- | pttbbs/mbbsd/friend.c | 7 | ||||
| -rw-r--r-- | pttbbs/mbbsd/mbbsd.c | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/pttbbs/mbbsd/friend.c b/pttbbs/mbbsd/friend.c index 23d5f85f..39ef2148 100644 --- a/pttbbs/mbbsd/friend.c +++ b/pttbbs/mbbsd/friend.c @@ -257,6 +257,7 @@ friend_editdesc(char *uident, int type) } } +/* type == 0 : load all */ void friend_load(int type) { @@ -266,7 +267,7 @@ friend_load(int type) int friendcount, rejectedcount; char genbuf[200]; - if (type & FRIEND_OVERRIDE) { + if (!type || type & FRIEND_OVERRIDE) { memset(myfriends, 0, sizeof(myfriends)); friendcount = 0; setuserfile(genbuf, fn_overrides); @@ -282,7 +283,7 @@ friend_load(int type) memcpy(currutmp->friend, myfriends, sizeof(myfriends)); } - if (type & FRIEND_EJECT) { + if (!type || type & FRIEND_REJECT) { memset(myrejects, 0, sizeof(myrejects)); rejectedcount = 0; setuserfile(genbuf, fn_reject); @@ -456,7 +457,7 @@ friend_edit(int type) fclose(fp); } } - friend_load(); + friend_load(0); } } diff --git a/pttbbs/mbbsd/mbbsd.c b/pttbbs/mbbsd/mbbsd.c index 660bdb80..69b84742 100644 --- a/pttbbs/mbbsd/mbbsd.c +++ b/pttbbs/mbbsd/mbbsd.c @@ -753,7 +753,7 @@ setup_utmp(int mode) if (!(cuser.numlogins % 20) && cuser.userlevel & PERM_BM) check_BM(); /* Ptt 自動取下離職板主權力 */ #ifndef _BBS_UTIL_C_ - friend_load(FRIEND_OVERRIDE | FRIEND_EJECT); + friend_load(0); nice(3); #endif } |