X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cban.cpp;h=57bb9490a20c73749d069e73edea7ebad954252d;hb=2330fc9ddd48c939e894e7e37e9bb2e62eafc38d;hp=ae0961f29dc4e21b5b30bdb7a0b935ecae63c312;hpb=2080de06813794dc52ee9d0a0809e3411fb9a43b;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp index ae0961f29..57bb9490a 100644 --- a/src/modules/m_cban.cpp +++ b/src/modules/m_cban.cpp @@ -1,16 +1,16 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* +------------------------------------+ + * | Inspire Internet Relay Chat Daemon | + * +------------------------------------+ * * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * + * E-mail: + * + * * - * + * * Written by Craig Edwards, Craig McLure, and others. * This program is free but copyrighted software; see - * the file COPYING for details. + *the file COPYING for details. * * --------------------------------------------------- */ @@ -23,13 +23,14 @@ #include "channels.h" #include "modules.h" #include "helperfuncs.h" +#include "hashcomp.h" /* $ModDesc: Gives /cban, aka C:lines. Think Q:lines, for channels. */ -class CBan +class CBan : public classbase { public: - std::string chname; + irc::string chname; std::string set_by; time_t set_on; long length; @@ -39,7 +40,7 @@ public: { } - CBan(std::string cn, std::string sb, time_t so, long ln, std::string rs) : chname(cn), set_by(sb), set_on(so), length(ln), reason(rs) + CBan(irc::string cn, std::string sb, time_t so, long ln, std::string rs) : chname(cn), set_by(sb), set_on(so), length(ln), reason(rs) { } }; @@ -48,7 +49,6 @@ std::string EncodeCBan(const CBan &ban); CBan DecodeCBan(const std::string &data); bool CBanComp(const CBan &ban1, const CBan &ban2); void ExpireBans(); -bool IsValidChan(const char* cname); extern time_t TIME; typedef std::vector cbanlist; @@ -68,7 +68,7 @@ class cmd_cban : public command_t this->Srv = Me; } - void Handle(char **parameters, int pcnt, userrec *user) + void Handle(const char** parameters, int pcnt, userrec *user) { /* syntax: CBAN #channel time :reason goes here */ /* 'time' is a human-readable timestring, like 2d3h2s. */ @@ -92,30 +92,32 @@ class cmd_cban : public command_t else if (pcnt >= 2) { /* full form to add a CBAN */ - if(IsValidChan(parameters[0])) + if (IsValidChannelName(parameters[0])) { // parameters[0] = #channel // parameters[1] = 1h3m2s // parameters[2] = Tortoise abuser long length = Srv->CalcDuration(parameters[1]); + std::string reason = (pcnt > 2) ? parameters[2] : "No reason supplied"; - cbans.push_back(CBan(parameters[0], user->nick, TIME, length, parameters[2])); + cbans.push_back(CBan(parameters[0], user->nick, TIME, length, reason)); + std::sort(cbans.begin(), cbans.end(), CBanComp); if(length > 0) { - WriteServ(user->fd, "385 %s %s :Added %lu second channel ban (%s)", user->nick, parameters[0], length, parameters[2]); - WriteOpers("*** %s added %lu second channel ban on %s (%s)", user->nick, length, parameters[0], parameters[2]); + WriteServ(user->fd, "385 %s %s :Added %lu second channel ban (%s)", user->nick, parameters[0], length, reason.c_str()); + WriteOpers("*** %s added %lu second channel ban on %s (%s)", user->nick, length, parameters[0], reason.c_str()); } else { - WriteServ(user->fd, "385 %s %s :Added permenant channel ban (%s)", user->nick, parameters[0], parameters[2]); - WriteOpers("*** %s added permenant channel ban on %s (%s)", user->nick, parameters[0], parameters[2]); + WriteServ(user->fd, "385 %s %s :Added permenant channel ban (%s)", user->nick, parameters[0], reason.c_str()); + WriteOpers("*** %s added permenant channel ban on %s (%s)", user->nick, parameters[0], reason.c_str()); } } else { - WriteServ(user->fd, "403 %s %s :No such channel", user->nick, parameters[0]); + WriteServ(user->fd, "403 %s %s :Invalid channel name", user->nick, parameters[0]); } } } @@ -143,10 +145,13 @@ class ModuleCBan : public Module { ExpireBans(); - for(cbanlist::iterator iter = cbans.begin(); iter != cbans.end(); iter++) + if(symbol == 'C') { - unsigned long remaining = (iter->set_on + iter->length) - TIME; - WriteServ(user->fd, "210 %s %s %s %lu %lu %lu :%s", user->nick, iter->chname.c_str(), iter->set_by.c_str(), iter->set_on, iter->length, remaining, iter->reason.c_str()); + for(cbanlist::iterator iter = cbans.begin(); iter != cbans.end(); iter++) + { + unsigned long remaining = (iter->set_on + iter->length) - TIME; + WriteServ(user->fd, "210 %s %s %s %lu %lu %lu :%s", user->nick, iter->chname.c_str(), iter->set_by.c_str(), iter->set_on, iter->length, remaining, iter->reason.c_str()); + } } return 0; @@ -159,7 +164,7 @@ class ModuleCBan : public Module /* check cbans in here, and apply as necessary. */ for(cbanlist::iterator iter = cbans.begin(); iter != cbans.end(); iter++) { - if(iter->chname == cname && !strchr(user->modes, 'o')) + if(iter->chname == cname && !user->modes[UM_OPERATOR]) { // Channel is banned. WriteServ(user->fd, "384 %s %s :Cannot join channel, CBANed (%s)", user->nick, cname, iter->reason.c_str()); @@ -178,7 +183,7 @@ class ModuleCBan : public Module } } - virtual void OnDecodeMetaData(int target_type, void* target, std::string extname, std::string extdata) + virtual void OnDecodeMetaData(int target_type, void* target, const std::string &extname, const std::string &extdata) { if((target_type == TYPE_OTHER) && (extname == "cban")) { @@ -193,7 +198,7 @@ class ModuleCBan : public Module virtual Version GetVersion() { - return Version(1,0,0,0,VF_VENDOR); + return Version(1,0,0,1,VF_VENDOR); } }; @@ -207,7 +212,7 @@ std::string EncodeCBan(const CBan &ban) CBan DecodeCBan(const std::string &data) { CBan res; - std::istringstream stream; + std::istringstream stream(data); stream >> res.chname; stream >> res.set_by; stream >> res.set_on; @@ -224,29 +229,30 @@ bool CBanComp(const CBan &ban1, const CBan &ban2) void ExpireBans() { - while(cbans.size() && ((cbans.begin()->set_on + cbans.begin()->length) <= TIME)) + bool go_again = true; + + while (go_again) { - cbanlist::iterator iter = cbans.begin(); - - log(DEBUG, "m_cban.so: Ban on %s expired, removing...", iter->chname.c_str()); - WriteOpers("*** %li second CBAN on %s (%s) set %u seconds ago expired", iter->length, iter->chname.c_str(), iter->reason.c_str(), TIME - iter->set_on); - cbans.erase(iter); - } -} + go_again = false; -bool IsValidChan(const char* cname) -{ - if(!cname) - return false; - - if(cname[0] != '#') - return false; - - for(unsigned int i = 0; i < strlen(cname); i++) - if((cname[i] == ' ') || (cname[i] == '\7') || (cname[i] == ',')) - return false; - - return true; + for (cbanlist::iterator iter = cbans.begin(); iter != cbans.end(); iter++) + { + /* 0 == permanent, don't mess with them! -- w00t */ + if (iter->length != 0) + { + if (iter->set_on + iter->length <= TIME) + { + log(DEBUG, "m_cban.so: Ban on %s expired, removing...", iter->chname.c_str()); + WriteOpers("*** %li second CBAN on %s (%s) set %u seconds ago expired", iter->length, iter->chname.c_str(), iter->reason.c_str(), TIME - iter->set_on); + cbans.erase(iter); + go_again = true; + } + } + + if (go_again == true) + break; + } + } } class ModuleCBanFactory : public ModuleFactory