X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_timedbans.cpp;h=31896bfcba0d5e7b79d23dae56dac7e5e52dd845;hb=8cebe2878f3878afce6f643d93668155cb26801d;hp=2eab8b87207fbd39e153797ada1139991d5711a6;hpb=eb4229deed0281ae566ef7e55a144e5d3183a4b2;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp index 2eab8b872..31896bfcb 100644 --- a/src/modules/m_timedbans.cpp +++ b/src/modules/m_timedbans.cpp @@ -2,35 +2,22 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * Inspire is copyright (C) 2002-2004 ChatSpike-Dev. - * E-mail: - * - * - * - * Written by Craig Edwards, Craig McLure, and others. + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits + * * This program is free but copyrighted software; see - * the file COPYING for details. + * the file COPYING for details. * * --------------------------------------------------- */ /* $ModDesc: Adds timed bans */ -/* - * ToDo: - * Err... not a lot really. - */ - -#include -#include -#include "users.h" -#include "channels.h" -#include "modules.h" -#include "helperfuncs.h" +#include "inspircd.h" -Server *Srv; - -class TimedBan +/** Holds a timed ban + */ +class TimedBan : public classbase { public: std::string channel; @@ -41,150 +28,164 @@ class TimedBan typedef std::vector timedbans; timedbans TimedBanList; -void handle_tban(char **parameters, int pcnt, userrec *user) +/** Handle /TBAN + */ +class CommandTban : public Command { - chanrec* channel = Srv->FindChannel(parameters[0]); - if (channel) + public: + CommandTban (InspIRCd* Instance) : Command(Instance,"TBAN", 0, 3) { - std::string cm = Srv->ChanMode(user,channel); - if ((cm == "%") || (cm == "@")) + this->source = "m_timedbans.so"; + syntax = " "; + TRANSLATE4(TR_TEXT, TR_TEXT, TR_TEXT, TR_END); + } + + CmdResult Handle (const std::vector ¶meters, User *user) + { + Channel* 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++) - { - if ((!strcasecmp(i->mask.c_str(),parameters[2])) && (!strcasecmp(i->channel.c_str(),parameters[0]))) + 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])); - return; + user->WriteServ("NOTICE "+std::string(user->nick)+" :Invalid ban mask"); + return CMD_FAILURE; } + for (BanList::iterator i = channel->bans.begin(); i != channel->bans.end(); i++) + { + if (!strcasecmp(i->data.c_str(), parameters[2].c_str())) + { + user->WriteServ("NOTICE "+std::string(user->nick)+" :The ban "+parameters[2]+" is already on the banlist of "+parameters[0]); + return CMD_FAILURE; + } + } + TimedBan T; + std::string channelname = parameters[0]; + long duration = ServerInstance->Duration(parameters[1]); + unsigned long expire = duration + ServerInstance->Time(); + if (duration < 1) + { + user->WriteServ("NOTICE "+std::string(user->nick)+" :Invalid ban time"); + return CMD_FAILURE; + } + std::string mask = parameters[2]; + std::vector setban; + setban.push_back(parameters[0]); + setban.push_back("+b"); + setban.push_back(parameters[2]); + // use CallCommandHandler to make it so that the user sets the mode + // themselves + ServerInstance->CallCommandHandler("MODE",setban,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.c_str(), mask.c_str())) + was_added = true; + if (was_added) + { + CUList tmp; + T.channel = channelname; + T.mask = mask; + T.expire = expire; + TimedBanList.push_back(T); + channel->WriteAllExcept(user, true, '@', tmp, "NOTICE %s :%s added a timed ban on %s lasting for %ld seconds.", channel->name.c_str(), user->nick.c_str(), mask.c_str(), duration); + ServerInstance->PI->SendChannelNotice(channel, '@', user->nick + " added a timed ban on " + mask + " lasting for " + ConvToStr(duration) + " seconds."); + if (ServerInstance->Config->AllowHalfop) + { + channel->WriteAllExcept(user, true, '%', tmp, "NOTICE %s :%s added a timed ban on %s lasting for %ld seconds.", channel->name.c_str(), user->nick.c_str(), mask.c_str(), duration); + ServerInstance->PI->SendChannelNotice(channel, '%', user->nick + " added a timed ban on " + mask + " lasting for " + ConvToStr(duration) + " seconds."); + } + return CMD_SUCCESS; + } + return CMD_FAILURE; } - 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"); - 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."); - return; + else user->WriteNumeric(482, "%s %s :You must be at least a%soperator to change modes on this channel",user->nick.c_str(), channel->name.c_str(), + ServerInstance->Config->AllowHalfop ? " half-" : " channel "); + return CMD_FAILURE; } - 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->WriteNumeric(401, "%s %s :No such channel",user->nick.c_str(), parameters[0].c_str()); + return CMD_FAILURE; } - WriteServ(user->fd,"401 %s %s :No such channel",user->nick, parameters[0]); -} +}; class ModuleTimedBans : public Module { + CommandTban cmd; public: - ModuleTimedBans() + ModuleTimedBans(InspIRCd* Me) + : Module(Me), cmd(Me) { - Srv = new Server; - Srv->AddCommand("TBAN",handle_tban,0,3,"m_timedbans.so"); + ServerInstance->AddCommand(&cmd); TimedBanList.clear(); + Implementation eventlist[] = { I_OnDelBan, I_OnBackgroundTimer }; + ServerInstance->Modules->Attach(eventlist, this, 2); } - + virtual ~ModuleTimedBans() { - delete Srv; TimedBanList.clear(); } - virtual int OnDelBan(userrec* source, chanrec* chan, std::string banmask) + virtual int OnDelBan(User* source, Channel* chan, const std::string &banmask) { - for (timedbans::iterator i = TimedBanList.begin(); i < TimedBanList.end(); i++) - { - if (!strcasecmp(banmask.c_str(),i->mask.c_str())) - { - TimedBanList.erase(i); - break; - } - } + irc::string listitem = banmask.c_str(); + irc::string thischan = chan->name.c_str(); + for (timedbans::iterator i = TimedBanList.begin(); i != TimedBanList.end(); i++) + { + irc::string target = i->mask.c_str(); + irc::string tchan = i->channel.c_str(); + if ((listitem == target) && (tchan == thischan)) + { + TimedBanList.erase(i); + break; + } + } return 0; } virtual void OnBackgroundTimer(time_t curtime) { - bool again = true; - while (again) + for (timedbans::iterator i = TimedBanList.begin(); i != TimedBanList.end();) { - again = false; - for (timedbans::iterator i = TimedBanList.begin(); i < TimedBanList.end(); i++) + if (curtime > i->expire) { - if (curtime > i->expire) + std::string chan = i->channel; + std::string mask = i->mask; + Channel* cr = ServerInstance->FindChan(chan); + i = TimedBanList.erase(i); + if (cr) { - chanrec* cr = Srv->FindChannel(i->channel); - again = true; - if (cr) + std::vector setban; + setban.push_back(chan); + setban.push_back("-b"); + setban.push_back(mask); + + CUList empty; + std::string expiry = "*** Timed ban on " + chan + " expired."; + cr->WriteAllExcept(ServerInstance->FakeClient, true, '@', empty, "NOTICE %s :%s", cr->name.c_str(), expiry.c_str()); + ServerInstance->PI->SendChannelNotice(cr, '@', expiry); + if (ServerInstance->Config->AllowHalfop) { - 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(); - setban[1] = "-b"; - setban[2] = (char*)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; - temp->fd = FD_MAGIC_NUMBER; - Srv->SendMode(setban,3,temp); - delete temp; + cr->WriteAllExcept(ServerInstance->FakeClient, true, '%', empty, "NOTICE %s :%s", cr->name.c_str(), expiry.c_str()); + ServerInstance->PI->SendChannelNotice(cr, '%', expiry); } - // we used to delete the item here, but we dont need to as the servermode above does it for us, - break; + + ServerInstance->SendMode(setban, ServerInstance->FakeClient); + ServerInstance->PI->SendMode(chan, ServerInstance->Modes->GetLastParseParams(), ServerInstance->Modes->GetLastParseTranslate()); } } + else + ++i; } } - - virtual Version GetVersion() - { - return Version(1,0,0,0,VF_VENDOR); - } -}; - -class ModuleTimedBansFactory : public ModuleFactory -{ - public: - ModuleTimedBansFactory() - { - } - - ~ModuleTimedBansFactory() - { - } - - virtual Module * CreateModule() + virtual Version GetVersion() { - return new ModuleTimedBans; + return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION); } - }; +MODULE_INIT(ModuleTimedBans) -extern "C" void * init_module( void ) -{ - return new ModuleTimedBansFactory; -}