X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cban.cpp;h=21a3533ec52150b048b71ff787ed8525674975ba;hb=d54fd9b1e6b31f69332a9241b5f17330c0ad61e0;hp=db0bf657af2a013c604102a6c9c902654d66bd05;hpb=c6d28ade53dd307a079dc6cbac2ae5df22aef4f9;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp index db0bf657a..21a3533ec 100644 --- a/src/modules/m_cban.cpp +++ b/src/modules/m_cban.cpp @@ -1,33 +1,30 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* +------------------------------------+ + * | Inspire Internet Relay Chat Daemon | + * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * - * - * + * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. + * 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. * * --------------------------------------------------- */ #include -#include -#include -#include #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" -#include "hashcomp.h" +#include "configreader.h" +#include "inspircd.h" /* $ModDesc: Gives /cban, aka C:lines. Think Q:lines, for channels. */ -class CBan +class CBan : public classbase { public: irc::string chname; @@ -45,12 +42,8 @@ public: } }; -std::string EncodeCBan(const CBan &ban); -CBan DecodeCBan(const std::string &data); bool CBanComp(const CBan &ban1, const CBan &ban2); -void ExpireBans(); -extern time_t TIME; typedef std::vector cbanlist; /* cbans is declared here, as our type is right above. Don't try move it. */ @@ -58,22 +51,18 @@ cbanlist cbans; class cmd_cban : public command_t { - private: - Server *Srv; - public: - cmd_cban(Server* Me) : command_t("CBAN", 'o', 1) + cmd_cban(InspIRCd* Me) : command_t(Me, "CBAN", 'o', 1) { this->source = "m_cban.so"; - this->Srv = Me; + this-> + syntax = " [ :]"; } - 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. */ - - ExpireBans(); if(pcnt == 1) { @@ -82,8 +71,8 @@ class cmd_cban : public command_t { if (parameters[0] == iter->chname) { - unsigned long remaining = (iter->set_on + iter->length) - TIME; - WriteServ(user->fd, "386 %s %s :Removed CBAN with %lu seconds left before expiry (%s)", user->nick, iter->chname.c_str(), remaining, iter->reason.c_str()); + unsigned long remaining = (iter->set_on + iter->length) - ServerInstance->Time(); + user->WriteServ( "386 %s %s :Removed CBAN with %lu seconds left before expiry (%s)", user->nick, iter->chname.c_str(), remaining, iter->reason.c_str()); cbans.erase(iter); break; } @@ -92,48 +81,53 @@ class cmd_cban : public command_t else if (pcnt >= 2) { /* full form to add a CBAN */ - if (IsValidChannelName(parameters[0])) + if (ServerInstance->IsChannel(parameters[0])) { // parameters[0] = #channel // parameters[1] = 1h3m2s // parameters[2] = Tortoise abuser - long length = Srv->CalcDuration(parameters[1]); + long length = ServerInstance->Duration(parameters[1]); std::string reason = (pcnt > 2) ? parameters[2] : "No reason supplied"; - cbans.push_back(CBan(parameters[0], user->nick, TIME, length, reason)); + cbans.push_back(CBan(parameters[0], user->nick, ServerInstance->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, reason.c_str()); - WriteOpers("*** %s added %lu second channel ban on %s (%s)", user->nick, length, parameters[0], reason.c_str()); + user->WriteServ( "385 %s %s :Added %lu second channel ban (%s)", user->nick, parameters[0], length, reason.c_str()); + ServerInstance->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], reason.c_str()); - WriteOpers("*** %s added permenant channel ban on %s (%s)", user->nick, parameters[0], reason.c_str()); + user->WriteServ( "385 %s %s :Added permenant channel ban (%s)", user->nick, parameters[0], reason.c_str()); + ServerInstance->WriteOpers("*** %s added permenant channel ban on %s (%s)", user->nick, parameters[0], reason.c_str()); } } else { - WriteServ(user->fd, "403 %s %s :Invalid channel name", user->nick, parameters[0]); + user->WriteServ( "403 %s %s :Invalid channel name", user->nick, parameters[0]); } } } }; +bool CBanComp(const CBan &ban1, const CBan &ban2) +{ + return ((ban1.set_on + ban1.length) < (ban2.set_on + ban2.length)); +} + class ModuleCBan : public Module { cmd_cban* mycommand; - Server* Srv; + public: - ModuleCBan(Server* Me) : Module::Module(Me) + ModuleCBan(InspIRCd* Me) : Module::Module(Me) { - Srv = Me; - mycommand = new cmd_cban(Srv); - Srv->AddCommand(mycommand); + + mycommand = new cmd_cban(Me); + ServerInstance->AddCommand(mycommand); } void Implements(char* List) @@ -141,7 +135,7 @@ class ModuleCBan : public Module List[I_OnUserPreJoin] = List[I_OnSyncOtherMetaData] = List[I_OnDecodeMetaData] = List[I_OnStats] = 1; } - virtual int OnStats(char symbol, userrec* user) + virtual int OnStats(char symbol, userrec* user, string_list &results) { ExpireBans(); @@ -149,8 +143,8 @@ class ModuleCBan : public Module { 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()); + unsigned long remaining = (iter->set_on + iter->length) - ServerInstance->Time(); + results.push_back(std::string(ServerInstance->Config->ServerName)+" 210 "+user->nick+" "+iter->chname.c_str()+" "+iter->set_by+" "+ConvToStr(iter->set_on)+" "+ConvToStr(iter->length)+" "+ConvToStr(remaining)+" :"+iter->reason); } } @@ -164,11 +158,11 @@ 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()); - WriteOpers("*** %s tried to join %s which is CBANed (%s)", user->nick, cname, iter->reason.c_str()); + user->WriteServ( "384 %s %s :Cannot join channel, CBANed (%s)", user->nick, cname, iter->reason.c_str()); + ServerInstance->WriteOpers("*** %s tried to join %s which is CBANed (%s)", user->nick, cname, iter->reason.c_str()); return 1; } } @@ -200,44 +194,55 @@ class ModuleCBan : public Module { return Version(1,0,0,1,VF_VENDOR); } -}; -std::string EncodeCBan(const CBan &ban) -{ - std::ostringstream stream; - stream << ban.chname << " " << ban.set_by << " " << ban.set_on << " " << ban.length << " " << ban.reason; - return stream.str(); -} + std::string EncodeCBan(const CBan &ban) + { + std::ostringstream stream; + stream << ban.chname << " " << ban.set_by << " " << ban.set_on << " " << ban.length << " " << ban.reason; + return stream.str(); + } -CBan DecodeCBan(const std::string &data) -{ - CBan res; - std::istringstream stream(data); - stream >> res.chname; - stream >> res.set_by; - stream >> res.set_on; - stream >> res.length; - res.reason = stream.str(); + CBan DecodeCBan(const std::string &data) + { + CBan res; + std::istringstream stream(data); + stream >> res.chname; + stream >> res.set_by; + stream >> res.set_on; + stream >> res.length; + res.reason = stream.str(); - return res; -} - -bool CBanComp(const CBan &ban1, const CBan &ban2) -{ - return ((ban1.set_on + ban1.length) < (ban2.set_on + ban2.length)); -} + return res; + } -void ExpireBans() -{ - while(cbans.size() && ((cbans.begin()->set_on + cbans.begin()->length) <= TIME)) + void ExpireBans() { - 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); + bool go_again = true; + + while (go_again) + { + go_again = false; + + 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 <= ServerInstance->Time()) + { + ServerInstance->Log(DEBUG, "m_cban.so: Ban on %s expired, removing...", iter->chname.c_str()); + ServerInstance->WriteOpers("*** %li second CBAN on %s (%s) set %u seconds ago expired", iter->length, iter->chname.c_str(), iter->reason.c_str(), ServerInstance->Time() - iter->set_on); + cbans.erase(iter); + go_again = true; + } + } + + if (go_again == true) + break; + } + } } -} +}; class ModuleCBanFactory : public ModuleFactory { @@ -250,7 +255,7 @@ class ModuleCBanFactory : public ModuleFactory { } - virtual Module * CreateModule(Server* Me) + virtual Module * CreateModule(InspIRCd* Me) { return new ModuleCBan(Me); }