X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_timedbans.cpp;h=c0816419f1f1880a9c5a3f6dad7ee2fcf5232c64;hb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;hp=473785149ced082ddcc771ffe086aa562dbbe35d;hpb=76d7e8a0684b38a82e6c05ebd7538b69660e1bef;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp index 473785149..c0816419f 100644 --- a/src/modules/m_timedbans.cpp +++ b/src/modules/m_timedbans.cpp @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * 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. @@ -14,11 +14,6 @@ /* $ModDesc: Adds timed bans */ #include "inspircd.h" -#include "users.h" -#include "channels.h" -#include "modules.h" -#include "hashcomp.h" -#include "configreader.h" /** Holds a timed ban */ @@ -35,22 +30,22 @@ timedbans TimedBanList; /** Handle /TBAN */ -class cmd_tban : public command_t +class CommandTban : public Command { public: - cmd_tban (InspIRCd* Instance) : command_t(Instance,"TBAN", 0, 3) + CommandTban(Module* Creator) : Command(Creator,"TBAN", 3) { - this->source = "m_timedbans.so"; syntax = " "; + TRANSLATE4(TR_TEXT, TR_TEXT, TR_TEXT, TR_END); } - CmdResult Handle (const char** parameters, int pcnt, userrec *user) + CmdResult Handle (const std::vector ¶meters, User *user) { - chanrec* channel = ServerInstance->FindChan(parameters[0]); + Channel* channel = ServerInstance->FindChan(parameters[0]); if (channel) { - int cm = channel->GetStatus(user); - if ((cm == STATUS_HOP) || (cm == STATUS_OP)) + int cm = channel->GetPrefixValue(user); + if ((cm == HALFOP_VALUE) || (cm == OP_VALUE)) { if (!ServerInstance->IsValidMask(parameters[2])) { @@ -59,82 +54,89 @@ class cmd_tban : public command_t } for (BanList::iterator i = channel->bans.begin(); i != channel->bans.end(); i++) { - if (!strcasecmp(i->data,parameters[2])) + if (!strcasecmp(i->data.c_str(), parameters[2].c_str())) { - user->WriteServ("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)+" :The ban "+parameters[2]+" is already on the banlist of "+parameters[0]); return CMD_FAILURE; } } TimedBan T; std::string channelname = parameters[0]; - unsigned long expire = ServerInstance->Duration(parameters[1]) + time(NULL); - if (ServerInstance->Duration(parameters[1]) < 1) + 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; } - char duration[MAXBUF]; - snprintf(duration,MAXBUF,"%lu",ServerInstance->Duration(parameters[1])); std::string mask = parameters[2]; - const char *setban[32]; - setban[0] = parameters[0]; - setban[1] = "+b"; - setban[2] = 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,3,user); + 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,mask.c_str())) + 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->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); + 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; } - else user->WriteServ("482 %s %s :You must be at least a half-operator to change modes on this channel",user->nick, channel->name); + 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; } - user->WriteServ("401 %s %s :No such channel",user->nick, parameters[0]); + user->WriteNumeric(401, "%s %s :No such channel",user->nick.c_str(), parameters[0].c_str()); return CMD_FAILURE; } + + RouteDescriptor GetRouting(User* user, const std::vector& parameters) + { + return ROUTE_BROADCAST; + } }; class ModuleTimedBans : public Module { - cmd_tban* mycommand; + CommandTban cmd; public: - ModuleTimedBans(InspIRCd* Me) - : Module(Me) + ModuleTimedBans() + : cmd(this) { - - mycommand = new cmd_tban(ServerInstance); - ServerInstance->AddCommand(mycommand); + ServerInstance->AddCommand(&cmd); TimedBanList.clear(); + Implementation eventlist[] = { I_OnDelBan, I_OnBackgroundTimer }; + ServerInstance->Modules->Attach(eventlist, this, 2); } - + virtual ~ModuleTimedBans() { TimedBanList.clear(); } - void Implements(char* List) - { - List[I_OnDelBan] = List[I_OnBackgroundTimer] = 1; - } - - virtual int OnDelBan(userrec* source, chanrec* chan, const std::string &banmask) + virtual ModResult OnDelBan(User* source, Channel* chan, const std::string &banmask) { irc::string listitem = banmask.c_str(); - irc::string thischan = chan->name; - for (timedbans::iterator i = TimedBanList.begin(); i < TimedBanList.end(); i++) + 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(); @@ -144,84 +146,50 @@ class ModuleTimedBans : public Module break; } } - return 0; + return MOD_RES_PASSTHRU; } 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 = ServerInstance->FindChan(i->channel); - again = true; - if (cr) - { - 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] = 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(ServerInstance); - temp->SetFd(FD_MAGIC_NUMBER); - /* FIX: Send mode remotely*/ - std::deque n; - n.push_back(setban[0]); - n.push_back("-b"); - n.push_back(setban[2]); - ServerInstance->SendMode(setban,3,temp); - Event rmode((char *)&n, NULL, "send_mode"); - rmode.Send(ServerInstance); - DELETE(temp); - } - else + 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) { - /* Where the hell did our channel go?! */ - TimedBanList.erase(i); + 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,1,0,0,VF_VENDOR,API_VERSION); - } -}; - -class ModuleTimedBansFactory : public ModuleFactory -{ - public: - ModuleTimedBansFactory() - { - } - - ~ModuleTimedBansFactory() - { - } - - virtual Module * CreateModule(InspIRCd* Me) + virtual Version GetVersion() { - return new ModuleTimedBans(Me); + return Version("Adds timed bans", VF_COMMON | VF_VENDOR, API_VERSION); } - }; +MODULE_INIT(ModuleTimedBans) -extern "C" DllExport void * init_module( void ) -{ - return new ModuleTimedBansFactory; -}