From deda4170ae183cf058150f5e9c73c31e0c9b33de Mon Sep 17 00:00:00 2001 From: ptt Date: Fri, 6 May 2005 17:34:37 +0000 Subject: corrected typos git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@2717 63ad8ddf-47c3-0310-b6dd-a9e9d9715204 --- mbbsd/bbs.c | 79 +++++++++++++++++++++++++++++++---------------------------- mbbsd/cache.c | 15 +++++++----- mbbsd/user.c | 9 ++++--- 3 files changed, 55 insertions(+), 48 deletions(-) (limited to 'mbbsd') diff --git a/mbbsd/bbs.c b/mbbsd/bbs.c index b017d3b0..2f17122e 100644 --- a/mbbsd/bbs.c +++ b/mbbsd/bbs.c @@ -537,29 +537,10 @@ do_general(int isbid) vmsg("你不夠資深喔！"); return FULLUPDATE; } - #ifdef USE_COOLDOWN - if ( !((currmode & MODE_BOARD) || HAS_PERM(PERM_SYSOP)) && - ((bcache[currbid - 1].brdattr & BRD_COOLDOWN) && now < cooldowntimeof(usernum)) ) { - move(5, 10); - vmsg("冷靜一下吧！"); - return FULLUPDATE; - } - -#ifdef NO_WATER_POST - /* 三分鐘內最多發表 9篇文章 */ - if(cooldowntimeof(usernum)=9) - { - vmsg("對不起，您的文章太水囉，待會再post吧！可用'X'推薦文章"); - return READ_REDRAW; - } -#endif // NO_WATER_POST - -#endif // USE_COOLDOWN + if(check_cooldown(bp)) + return READ_REDRAW; +#endif #endif clear(); @@ -646,12 +627,6 @@ do_general(int isbid) pressanykey(); return FULLUPDATE; } -#ifdef USE_COOLDOWN -#ifdef NO_WATER_POST - add_posttimes(usernum, 1); -#endif // NO_WATER_POST -#endif // USE_COOLDOWN - /* set owner to Anonymous , for Anonymous board */ #ifdef HAVE_ANONYMOUS @@ -766,8 +741,9 @@ do_general(int isbid) if (currbrdattr & BRD_ANONYMOUS) do_crosspost("UnAnonymous", &postfile, fpath); #ifdef USE_COOLDOWN - if (bcache[currbid - 1].brdattr & BRD_COOLDOWN) + if (cooldowntimeof(usernum)brdattr & BRD_NOTRAN)) outgo_post(&xfile, xboard, cuser.userid, cuser.username); #ifdef USE_COOLDOWN - if (bp->brdattr & BRD_COOLDOWN) + if (cooldowntimeof(usernum)title, 64-strlen(genbuf)); add_cooldowntime(tusernum, 60); - add_posttimes(tusernum, 9); //Ptt: 凍結 post for 1 hour + add_posttimes(tusernum, 15); //Ptt: 凍結 post for 1 hour if (!(inc_badpost(userid, 1) % 5)){ userec_t xuser; @@ -1978,7 +1951,7 @@ del_post(int ent, fileheader_t * fhdr, char *direct) mail_violatelaw(userid, "Ptt 系統警察", "劣文累計 5 篇", "罰單一張"); kick_all(userid); passwd_query(tusernum, &xuser); - xuser.money = moneyof(uid); + xuser.money = moneyof(tusernum); xuser.vl_count++; xuser.userlevel |= PERM_VIOLATELAW; passwd_update(tusernum, &xuser); @@ -2528,6 +2501,36 @@ change_restrictedpost(int ent, fileheader_t * fhdr, char *direct){ } #ifdef USE_COOLDOWN + +int check_cooldown(boardheader_t *bp) +{ + int diff = cooldowntimeof(usernum) - now; + + if(diff<0) + SHM->cooldowntime[usernum - 1] &= 0xFFFFFFF0; + else if( !((currmode & MODE_BOARD) || HAS_PERM(PERM_SYSOP))) + { + if( bp->brdattr & BRD_COOLDOWN ) + { + vmsg("冷靜一下吧！ (限制 %d 分 %d 秒)", diff/60, diff%60); + return 1; + } + else if(posttimesof(usernum)==15) + { + vmsg("對不起，您被設劣文！ (限制 %d 分 %d 秒)", diff/60, diff%60); + return 1; + } +#ifdef NO_WATER_POST + else if(posttimesof(usernum)==13) + { + vmsg("對不起，您的文章太水囉！用'X'推薦文章 (限制 %d 分 %d 秒)", + diff/60, diff%60); + return 1; + } +#endif // NO_WATER_POST + } + return 0; +} /** * 設定看板冷靜功能, 限制使用者發文時間 */ diff --git a/mbbsd/cache.c b/mbbsd/cache.c index 626ab06d..b65e8090 100644 --- a/mbbsd/cache.c +++ b/mbbsd/cache.c @@ -1038,15 +1038,18 @@ hbflcheck(int bid, int uid) void add_cooldowntime(int uid, int min) { // Ptt: I will use the number below 15 seconds. - time4_t base = (now & 0xFFFFFFF0) + 1; + time4_t base= now > SHM->cooldowntime[uid - 1]? + now : SHM->cooldowntime[uid - 1]; + base += min*60; + base &= 0xFFFFFFF0; - if(base < SHM->cooldowntime[uid - 1]) - base = SHM->cooldowntime[uid - 1]; - - SHM->cooldowntime[uid - 1] = base + min*60; + SHM->cooldowntime[uid - 1] = base; } void add_posttimes(int uid, int times) { - SHM->cooldowntime[uid - 1] + times; + if((SHM->cooldowntime[uid - 1] & 0xF) + times <0xF) + SHM->cooldowntime[uid - 1] += times; + else + SHM->cooldowntime[uid - 1] |= 0xF; } #endif diff --git a/mbbsd/user.c b/mbbsd/user.c index e67d4c68..b8fc5d77 100644 --- a/mbbsd/user.c +++ b/mbbsd/user.c @@ -200,11 +200,12 @@ void kick_all(char *user) { userinfo_t *ui; - int num = searchuser(user, NULL); - while(!(ui = (userinfo_t *) search_ulist(num))) + int num = searchuser(user, NULL), i=1; + while((ui = (userinfo_t *) search_ulistn(num, i))>0) { - if(ui == currutmp) continue; - kill(ui->pid, SIGHUP); + if(ui == currutmp) i++; + if ((ui->pid <= 0 || kill(ui->pid, SIGHUP) == -1)) + purge_utmp(ui); log_usies("KICK ALL", user); } } -- cgit v1.2.3