X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_timedbans.cpp;h=d290ec18d260831f55a8100d02d7db03f2508685;hb=cb4c516ace8fef75b8a54a141c3644af9697ac0a;hp=40c99484209684306dc3b3e4056ea53031c3ade2;hpb=e95f77bc9981b3e232899e8ff5e7d140efed92b7;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp index 40c994842..d290ec18d 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-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * InspIRCd: (C) 2002-2010 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -17,7 +17,7 @@ /** Holds a timed ban */ -class TimedBan : public classbase +class TimedBan { public: std::string channel; @@ -33,9 +33,8 @@ timedbans TimedBanList; class CommandTban : public Command { public: - CommandTban (InspIRCd* Instance) : Command(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); } @@ -43,94 +42,84 @@ class CommandTban : public Command CmdResult Handle (const std::vector ¶meters, User *user) { Channel* channel = ServerInstance->FindChan(parameters[0]); - if (channel) + if (!channel) { - int cm = channel->GetStatus(user); - if ((cm == STATUS_HOP) || (cm == STATUS_OP)) - { - if (!ServerInstance->IsValidMask(parameters[2])) - { - 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,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])); - return CMD_FAILURE; - } - } - TimedBan T; - std::string channelname = parameters[0]; - 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; - } - std::string mask = parameters[2]; - std::vector setban; - 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,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) - { - 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, 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->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 "); + user->WriteNumeric(401, "%s %s :No such channel",user->nick.c_str(), parameters[0].c_str()); + return CMD_FAILURE; + } + int cm = channel->GetPrefixValue(user); + if (cm < HALFOP_VALUE) + { + user->WriteNumeric(482, "%s %s :You do not have permission to set bans on this channel", + user->nick.c_str(), channel->name.c_str()); + return CMD_FAILURE; + } + if (!ServerInstance->IsValidMask(parameters[2])) + { + user->WriteServ("NOTICE "+std::string(user->nick)+" :Invalid ban mask"); return CMD_FAILURE; } - user->WriteNumeric(401, "%s %s :No such channel",user->nick, parameters[0].c_str()); + 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); + for (BanList::iterator i = channel->bans.begin(); i != channel->bans.end(); i++) + if (!strcasecmp(i->data.c_str(), mask.c_str())) + goto found; return CMD_FAILURE; +found: + CUList tmp; + T.channel = channelname; + T.mask = mask; + T.expire = expire; + TimedBanList.push_back(T); + channel->WriteAllExcept(ServerInstance->FakeClient, 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; + } + + RouteDescriptor GetRouting(User* user, const std::vector& parameters) + { + return ROUTE_BROADCAST; } }; class ModuleTimedBans : public Module { - CommandTban* mycommand; + CommandTban cmd; public: - ModuleTimedBans(InspIRCd* Me) - : Module(Me) + ModuleTimedBans() + : cmd(this) { - - mycommand = new CommandTban(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(); } - virtual int OnDelBan(User* source, Channel* 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(); @@ -140,53 +129,42 @@ class ModuleTimedBans : public Module break; } } - return 0; + return MOD_RES_PASSTHRU; } virtual void OnBackgroundTimer(time_t curtime) { - timedbans::iterator safei; - for (timedbans::iterator i = TimedBanList.begin(); i < TimedBanList.end();) + for (timedbans::iterator i = TimedBanList.begin(); i != TimedBanList.end();) { - /* 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); + std::string chan = i->channel; + std::string mask = i->mask; + Channel* cr = ServerInstance->FindChan(chan); + i = TimedBanList.erase(i); if (cr) { - std::string mask = safei->mask; std::vector setban; - setban[0] = safei->channel; - setban[1] = "-b"; - setban[2] = mask; + setban.push_back(chan); + setban.push_back("-b"); + setban.push_back(mask); 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, ServerInstance->FakeClient); + 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->Modes->GetLastParse().empty()) - TimedBanList.erase(safei); - } - else - { - /* Where the hell did our channel go?! */ - TimedBanList.erase(safei); + ServerInstance->SendGlobalMode(setban, ServerInstance->FakeClient); } } + else + ++i; } } - + virtual Version GetVersion() { - return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); + return Version("Adds timed bans", VF_COMMON | VF_VENDOR); } };