X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_timedbans.cpp;h=78915e3ef5280956fd8a7933beb8c16f2d3b9ad0;hb=8f7f74cf0f297e2b8476fc4c670515f8940580ea;hp=6c91d115682dff608555def809c8faa1f8229b41;hpb=d3d32dcf6ddb15d8ca9089de63a51b45b437a063;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp index 6c91d1156..78915e3ef 100644 --- a/src/modules/m_timedbans.cpp +++ b/src/modules/m_timedbans.cpp @@ -33,14 +33,14 @@ timedbans TimedBanList; class CommandTban : public Command { public: - CommandTban (InspIRCd* Instance) : Command(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* const* parameters, int pcnt, User *user) + CmdResult Handle (const std::vector ¶meters, User *user) { Channel* channel = ServerInstance->FindChan(parameters[0]); if (channel) @@ -55,9 +55,9 @@ class CommandTban : public Command } for (BanList::iterator i = channel->bans.begin(); i != channel->bans.end(); i++) { - if (!strcasecmp(i->data,parameters[2])) + 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])); + user->WriteServ("NOTICE "+std::string(user->nick)+" :The ban "+parameters[2]+" is already on the banlist of "+parameters[0]); return CMD_FAILURE; } } @@ -71,13 +71,13 @@ class CommandTban : public Command return CMD_FAILURE; } 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++) @@ -91,7 +91,8 @@ class CommandTban : public Command 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); - 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; @@ -100,7 +101,7 @@ class CommandTban : public Command ServerInstance->Config->AllowHalfop ? " half-" : " channel "); return CMD_FAILURE; } - user->WriteNumeric(401, "%s %s :No such channel",user->nick, parameters[0]); + user->WriteNumeric(401, "%s %s :No such channel",user->nick, parameters[0].c_str()); return CMD_FAILURE; } }; @@ -125,7 +126,6 @@ class ModuleTimedBans : public Module TimedBanList.clear(); } - virtual int OnDelBan(User* source, Channel* chan, const std::string &banmask) { irc::string listitem = banmask.c_str(); @@ -145,38 +145,40 @@ 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) { - Channel* cr = ServerInstance->FindChan(i->channel); - again = true; - if (cr) - { - const char *setban[3]; - setban[0] = i->channel.c_str(); - setban[1] = "-b"; - setban[2] = i->mask.c_str(); + std::string mask = safei->mask; + std::vector setban; + setban.push_back(safei->channel); + setban.push_back("-b"); + setban.push_back(mask); - ServerInstance->PI->SendMode(i->channel, std::string("-b ") + setban[2]); - ServerInstance->SendMode(setban,3, ServerInstance->FakeClient); + 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()); - CUList empty; - cr->WriteAllExcept(ServerInstance->FakeClient, true, '@', empty, "NOTICE %s :*** Timed ban on %s expired.", cr->name, i->mask.c_str()); - if (ServerInstance->Config->AllowHalfop) - cr->WriteAllExcept(ServerInstance->FakeClient, true, '%', empty, "NOTICE %s :*** Timed ban on %s expired.", cr->name, i->mask.c_str()); - } - 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; + /* Removes the ban item for us, no ::erase() needed */ + ServerInstance->PI->SendModeStr(safei->channel, std::string("-b ") + setban[2]); + ServerInstance->SendMode(setban, ServerInstance->FakeClient); + + if (ServerInstance->Modes->GetLastParse().empty()) + TimedBanList.erase(safei); + } + else + { + /* Where the hell did our channel go?! */ + TimedBanList.erase(safei); } } }