X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_timedbans.cpp;h=693e72019fa3a1aa102627a572d438fe4ac25b69;hb=8e89fe75f9467969bce1dc6930befc6ef273edf6;hp=a1f4411c3066bf93f18354a28f855cfc1b995b2c;hpb=4be89477502dd1fd47164bbc88ba62eeedcd0d54;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp index a1f4411c3..693e72019 100644 --- a/src/modules/m_timedbans.cpp +++ b/src/modules/m_timedbans.cpp @@ -2,35 +2,21 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * - * - * Written by Craig Edwards, Craig McLure, and others. + * InspIRCd: (C) 2002-2008 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/Credits + * * This program is free but copyrighted software; see - * the file COPYING for details. + * the file COPYING for details. * * --------------------------------------------------- */ -using namespace std; - /* $ModDesc: Adds timed bans */ -#include -#include -#include "users.h" -#include "channels.h" -#include "modules.h" - -#include "hashcomp.h" -#include "configreader.h" #include "inspircd.h" - - - +/** Holds a timed ban + */ class TimedBan : public classbase { public: @@ -42,18 +28,21 @@ class TimedBan : public classbase typedef std::vector timedbans; timedbans TimedBanList; -class cmd_tban : public command_t +/** Handle /TBAN + */ +class CommandTban : public Command { public: - cmd_tban (InspIRCd* Instance) : command_t(Instance,"TBAN", 0, 3) + CommandTban (InspIRCd* Instance) : Command(Instance,"TBAN", 0, 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 char* const* parameters, int pcnt, User *user) { - chanrec* channel = ServerInstance->FindChan(parameters[0]); + Channel* channel = ServerInstance->FindChan(parameters[0]); if (channel) { int cm = channel->GetStatus(user); @@ -74,14 +63,13 @@ class cmd_tban : public command_t } 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 + time(NULL); + 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]; @@ -97,34 +85,40 @@ class cmd_tban : public command_t 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, user->nick, mask.c_str(), duration); + if (ServerInstance->Config->AllowHalfop) + channel->WriteAllExcept(user, true, '%', tmp, "NOTICE %s :%s added a timed ban on %s lasting for %ld seconds.", channel->name, user->nick, mask.c_str(), duration); 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, channel->name, + 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, parameters[0]); return CMD_FAILURE; } }; class ModuleTimedBans : public Module { - cmd_tban* mycommand; + CommandTban* mycommand; public: ModuleTimedBans(InspIRCd* Me) - : Module::Module(Me) + : Module(Me) { - mycommand = new cmd_tban(ServerInstance); + mycommand = new CommandTban(ServerInstance); ServerInstance->AddCommand(mycommand); TimedBanList.clear(); + Implementation eventlist[] = { I_OnDelBan, I_OnBackgroundTimer }; + ServerInstance->Modules->Attach(eventlist, this, 2); } virtual ~ModuleTimedBans() @@ -132,12 +126,7 @@ class ModuleTimedBans : public Module 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 int OnDelBan(User* source, Channel* chan, const std::string &banmask) { irc::string listitem = banmask.c_str(); irc::string thischan = chan->name; @@ -156,47 +145,41 @@ class ModuleTimedBans : public Module virtual void OnBackgroundTimer(time_t curtime) { - bool again = true; - while (again) + timedbans::iterator safei; + for (timedbans::iterator i = TimedBanList.begin(); i < TimedBanList.end();) { - again = false; - for (timedbans::iterator i = TimedBanList.begin(); i < TimedBanList.end(); i++) + /* Safe copy of iterator, so we can erase as we iterate */ + safei = i; + ++i; + + if (curtime > safei->expire) { - if (curtime > i->expire) + Channel* cr = ServerInstance->FindChan(safei->channel); + 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 - { - /* 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; + const char *setban[3]; + std::string mask = safei->mask; + + setban[0] = safei->channel.c_str(); + setban[1] = "-b"; + setban[2] = mask.c_str(); + + CUList empty; + cr->WriteAllExcept(ServerInstance->FakeClient, true, '@', empty, "NOTICE %s :*** Timed ban on %s expired.", cr->name, safei->mask.c_str()); + if (ServerInstance->Config->AllowHalfop) + cr->WriteAllExcept(ServerInstance->FakeClient, true, '%', empty, "NOTICE %s :*** Timed ban on %s expired.", cr->name, safei->mask.c_str()); + + /* Removes the ban item for us, no ::erase() needed */ + ServerInstance->PI->SendModeStr(safei->channel, std::string("-b ") + setban[2]); + ServerInstance->SendMode(setban, 3, ServerInstance->FakeClient); + + if (ServerInstance->Modes->GetLastParse().empty()) + TimedBanList.erase(safei); + } + else + { + /* Where the hell did our channel go?! */ + TimedBanList.erase(safei); } } } @@ -204,31 +187,9 @@ class ModuleTimedBans : public Module virtual Version GetVersion() { - return Version(1,0,0,0,VF_VENDOR); - } -}; - - -class ModuleTimedBansFactory : public ModuleFactory -{ - public: - ModuleTimedBansFactory() - { + return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); } - - ~ModuleTimedBansFactory() - { - } - - virtual Module * CreateModule(InspIRCd* Me) - { - return new ModuleTimedBans(Me); - } - }; +MODULE_INIT(ModuleTimedBans) -extern "C" void * init_module( void ) -{ - return new ModuleTimedBansFactory; -}