X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_timedbans.cpp;h=30aba781c8f9a021320fac4f31a9bfb45f629424;hb=fd6ee21f2f55875984884a8413d61012e066029f;hp=c0511838c244878f273ed84ce8cf2e8c0101a3c5;hpb=82503a6b82042fb6d648690c8505dd31c6c057df;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp index c0511838c..30aba781c 100644 --- a/src/modules/m_timedbans.cpp +++ b/src/modules/m_timedbans.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * Inspire is copyright (C) 2002-2004 ChatSpike-Dev. + * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. * E-mail: * * @@ -14,12 +14,9 @@ * --------------------------------------------------- */ -/* $ModDesc: Adds timed bans */ +using namespace std; -/* - * ToDo: - * Err... not a lot really. - */ +/* $ModDesc: Adds timed bans */ #include #include @@ -28,10 +25,13 @@ #include "modules.h" #include "helperfuncs.h" #include "hashcomp.h" +#include "configreader.h" +#include "inspircd.h" + + + -Server *Srv; - -class TimedBan +class TimedBan : public classbase { public: std::string channel; @@ -42,90 +42,111 @@ class TimedBan typedef std::vector timedbans; timedbans TimedBanList; -void handle_tban(char **parameters, int pcnt, userrec *user) +class cmd_tban : public command_t { - chanrec* channel = Srv->FindChannel(parameters[0]); - if (channel) + public: + cmd_tban (InspIRCd* Instance) : command_t(Instance,"TBAN", 0, 3) + { + this->source = "m_timedbans.so"; + syntax = " "; + } + + void Handle (const char** parameters, int pcnt, userrec *user) { - std::string cm = Srv->ChanMode(user,channel); - if ((cm == "%") || (cm == "@")) + chanrec* channel = ServerInstance->FindChan(parameters[0]); + if (channel) { - if (!Srv->IsValidMask(parameters[2])) + int cm = channel->GetStatus(user); + if ((cm == STATUS_HOP) || (cm == STATUS_OP)) { - Srv->SendServ(user->fd,"NOTICE "+std::string(user->nick)+" :Invalid ban mask"); - return; - } - for (timedbans::iterator i = TimedBanList.begin(); i < TimedBanList.end(); i++) - { - irc::string listitem = i->mask.c_str(); - irc::string target = parameters[2]; - irc::string listchan = i->channel.c_str(); - irc::string targetchan = parameters[0]; - if ((listitem == target) && (listchan == targetchan)) + if (!ServerInstance->IsValidMask(parameters[2])) { - Srv->SendServ(user->fd,"NOTICE "+std::string(user->nick)+" :The ban "+std::string(parameters[2])+" is already on the banlist of "+std::string(parameters[0])); + user->WriteServ("NOTICE "+std::string(user->nick)+" :Invalid ban mask"); return; } - } - TimedBan T; - std::string channelname = parameters[0]; - unsigned long expire = Srv->CalcDuration(parameters[1]) + time(NULL); - if (Srv->CalcDuration(parameters[1]) < 1) - { - Srv->SendServ(user->fd,"NOTICE "+std::string(user->nick)+" :Invalid ban time"); + for (BanList::iterator i = channel->bans.begin(); i != channel->bans.end(); i++) + { + if (!strcasecmp(i->data,parameters[2])) + { + user->WriteServ("NOTICE "+std::string(user->nick)+" :The ban "+std::string(parameters[2])+" is already on the banlist of "+std::string(parameters[0])); + return; + } + } + TimedBan T; + std::string channelname = parameters[0]; + unsigned long expire = ServerInstance->CalcDuration(parameters[1]) + time(NULL); + if (ServerInstance->CalcDuration(parameters[1]) < 1) + { + user->WriteServ("NOTICE "+std::string(user->nick)+" :Invalid ban time"); + return; + } + char duration[MAXBUF]; + snprintf(duration,MAXBUF,"%lu",ServerInstance->CalcDuration(parameters[1])); + std::string mask = parameters[2]; + const char *setban[32]; + setban[0] = parameters[0]; + setban[1] = "+b"; + setban[2] = parameters[2]; + // use CallCommandHandler to make it so that the user sets the mode + // themselves + ServerInstance->CallCommandHandler("MODE",setban,3,user); + /* Check if the ban was actually added (e.g. banlist was NOT full) */ + bool was_added = false; + for (BanList::iterator i = channel->bans.begin(); i != channel->bans.end(); i++) + if (!strcasecmp(i->data,mask.c_str())) + was_added = true; + if (was_added) + { + T.channel = channelname; + T.mask = mask; + T.expire = expire; + TimedBanList.push_back(T); + channel->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s added a timed ban on %s lasting for %s seconds.", channel->name, user->nick, mask.c_str(), duration); + } return; } - char duration[MAXBUF]; - snprintf(duration,MAXBUF,"%lu",Srv->CalcDuration(parameters[1])); - std::string mask = parameters[2]; - char *setban[3]; - setban[0] = parameters[0]; - setban[1] = "+b"; - setban[2] = parameters[2]; - // use CallCommandHandler to make it so that the user sets the mode - // themselves - Srv->CallCommandHandler("MODE",setban,3,user); - T.channel = channelname; - T.mask = mask; - T.expire = expire; - TimedBanList.push_back(T); - Srv->SendChannelServerNotice(Srv->GetServerName(),channel,"NOTICE "+std::string(channel->name)+" :"+std::string(user->nick)+" added a timed ban on "+mask+" lasting for "+std::string(duration)+" seconds."); + else user->WriteServ("482 %s %s :You must be at least a half-operator to change modes on this channel",user->nick, channel->name); return; } - else WriteServ(user->fd,"482 %s %s :You must be at least a half-operator to change modes on this channel",user->nick, channel->name); - return; + user->WriteServ("401 %s %s :No such channel",user->nick, parameters[0]); } - WriteServ(user->fd,"401 %s %s :No such channel",user->nick, parameters[0]); -} +}; class ModuleTimedBans : public Module { + cmd_tban* mycommand; public: - ModuleTimedBans() + ModuleTimedBans(InspIRCd* Me) + : Module::Module(Me) { - Srv = new Server; - Srv->AddCommand("TBAN",handle_tban,0,3,"m_timedbans.so"); + + mycommand = new cmd_tban(ServerInstance); + ServerInstance->AddCommand(mycommand); TimedBanList.clear(); } virtual ~ModuleTimedBans() { - delete Srv; TimedBanList.clear(); } - virtual int OnDelBan(userrec* source, chanrec* chan, std::string banmask) + void Implements(char* List) { - for (timedbans::iterator i = TimedBanList.begin(); i < TimedBanList.end(); i++) - { - irc::string listitem = banmask.c_str(); - irc::string target = i->mask.c_str(); - if (listitem == target) - { - TimedBanList.erase(i); - break; - } - } + List[I_OnDelBan] = List[I_OnBackgroundTimer] = 1; + } + + virtual int OnDelBan(userrec* source, chanrec* chan, const std::string &banmask) + { + for (timedbans::iterator i = TimedBanList.begin(); i < TimedBanList.end(); i++) + { + irc::string listitem = banmask.c_str(); + irc::string target = i->mask.c_str(); + if (listitem == target) + { + TimedBanList.erase(i); + break; + } + } return 0; } @@ -139,24 +160,37 @@ class ModuleTimedBans : public Module { if (curtime > i->expire) { - chanrec* cr = Srv->FindChannel(i->channel); + chanrec* cr = ServerInstance->FindChan(i->channel); again = true; if (cr) { - Srv->SendChannelServerNotice(Srv->GetServerName(),cr,"NOTICE "+std::string(cr->name)+" :Timed ban on "+i->mask+" expired."); - char *setban[3]; - setban[0] = (char*)i->channel.c_str(); + cr->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :Timed ban on %s expired.", cr->name, i->mask.c_str()); + const char *setban[3]; + setban[0] = i->channel.c_str(); setban[1] = "-b"; - setban[2] = (char*)i->mask.c_str(); + setban[2] = i->mask.c_str(); // kludge alert! // ::SendMode expects a userrec* to send the numeric replies // back to, so we create it a fake user that isnt in the user // hash and set its descriptor to FD_MAGIC_NUMBER so the data // falls into the abyss :p - userrec* temp = new userrec; + userrec* temp = new userrec(ServerInstance); temp->fd = FD_MAGIC_NUMBER; - Srv->SendMode(setban,3,temp); - delete temp; + temp->server = ""; + ServerInstance->SendMode(setban,3,temp); + /* FIX: Send mode remotely*/ + std::deque n; + n.push_back(i->channel); + n.push_back("-b"); + n.push_back(i->mask); + Event rmode((char *)&n, NULL, "send_mode"); + rmode.Send(); + DELETE(temp); + } + else + { + /* Where the hell did our channel go?! */ + TimedBanList.erase(i); } // we used to delete the item here, but we dont need to as the servermode above does it for us, break; @@ -183,9 +217,9 @@ class ModuleTimedBansFactory : public ModuleFactory { } - virtual Module * CreateModule() + virtual Module * CreateModule(InspIRCd* Me) { - return new ModuleTimedBans; + return new ModuleTimedBans(Me); } };