summaryrefslogtreecommitdiffstats
path: root/mbbsd
diff options
context:
space:
mode:
authorpiaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2008-02-21 11:34:04 +0800
committerpiaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2008-02-21 11:34:04 +0800
commit02564e544003312cbcde9b3f2db8c6f6381ecbd8 (patch)
tree3412c538b44f265d9dad407c7f8e2c3b52074282 /mbbsd
parent5aefbfff8dfaf005a84e7d7679afeb1a7252c7e3 (diff)
downloadpttbbs-02564e544003312cbcde9b3f2db8c6f6381ecbd8.tar
pttbbs-02564e544003312cbcde9b3f2db8c6f6381ecbd8.tar.gz
pttbbs-02564e544003312cbcde9b3f2db8c6f6381ecbd8.tar.bz2
pttbbs-02564e544003312cbcde9b3f2db8c6f6381ecbd8.tar.lz
pttbbs-02564e544003312cbcde9b3f2db8c6f6381ecbd8.tar.xz
pttbbs-02564e544003312cbcde9b3f2db8c6f6381ecbd8.tar.zst
pttbbs-02564e544003312cbcde9b3f2db8c6f6381ecbd8.zip
- admin: change 'X' to 'D' for invalid accounts
- cache: only check aggressive for specific folder. git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@3932 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
Diffstat (limited to 'mbbsd')
-rw-r--r--mbbsd/admin.c2
-rw-r--r--mbbsd/cache.c10
2 files changed, 10 insertions, 2 deletions
diff --git a/mbbsd/admin.c b/mbbsd/admin.c
index 8aded7cb..68ff5cce 100644
--- a/mbbsd/admin.c
+++ b/mbbsd/admin.c
@@ -1846,7 +1846,7 @@ review_register_form(const char *regfile, int dryrun)
ri+1,
(unum && search_ulist(unum)) ?
ANSI_COLOR(1;35) : "" ANSI_COLOR(1),
- (unum == 0) ? ANSI_COLOR(1;31) "X" ANSI_RESET :
+ (unum == 0) ? ANSI_COLOR(1;31) "D" ANSI_RESET :
( (muser.userlevel & PERM_LOGINOK) ?
ANSI_COLOR(1;33) "Y" ANSI_RESET : " "),
v);
diff --git a/mbbsd/cache.c b/mbbsd/cache.c
index 58234432..6155753c 100644
--- a/mbbsd/cache.c
+++ b/mbbsd/cache.c
@@ -941,9 +941,17 @@ reload_pttcache(void)
// .DIR loop
while (fread(&item, sizeof(item), 1, fp)) {
+ int chkagg = 0; // should we check aggressive?
+
if (item.title[3] != '<' || item.title[8] != '>')
continue;
+#ifdef GLOBAL_NOTE_AGGCHKDIR
+ // TODO aggressive: only count '<ÂIºq>' section
+ if (strcmp(item.title, GLOBAL_NOTE_AGGCHKDIR) == 0)
+ chkagg = 1;
+#endif
+
snprintf(buf, sizeof(buf), "%s/%s/" FN_DIR,
pbuf, item.filename);
@@ -970,7 +978,7 @@ reload_pttcache(void)
memset(SHM->notes[id], 0, sizeof(SHM->notes[0]));
rawid --;
}
- else if (filter_aggressive(SHM->notes[id]))
+ else if (chkagg && filter_aggressive(SHM->notes[id]))
{
aggid++;
// handle aggressive notes by last detemined state