Fix REMOVE maxparams

[user/henk/code/inspircd.git] / src / modules / m_timedbans.cpp

diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp
index 39c05add9b9100361605aceb049115e80e38fa30..c4f8feafedacbe57566c13e997d14ab79da6847a 100644 (file)
--- a/src/modules/m_timedbans.cpp
+++ b/src/modules/m_timedbans.cpp
@@ -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 = "<channel> <duration> <banmask>";
                TRANSLATE4(TR_TEXT, TR_TEXT, TR_TEXT, TR_END);
        }
@@ -45,8 +44,8 @@ class CommandTban : public Command
                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]))
                                {
@@ -108,18 +107,21 @@ class CommandTban : public Command
                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<std::string>& parameters)
+       {
+               return ROUTE_BROADCAST;
+       }
 };
 
 class ModuleTimedBans : public Module
 {
-       CommandTban* mycommand;
+       CommandTban cmd;
  public:
        ModuleTimedBans(InspIRCd* Me)
-               : Module(Me)
+               : Module(Me), 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);
@@ -130,7 +132,7 @@ class ModuleTimedBans : public Module
                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.c_str();
@@ -144,51 +146,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();)
                {
-                       /* 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<std::string> setban;
-                                       setban.push_back(safei->channel);
+                                       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.c_str(), safei->mask.c_str());
-                                       ServerInstance->PI->SendChannelNotice(cr, '@', "*** Timed ban on " + safei->mask + " expired.");
+                                       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)
                                        {
-                                               cr->WriteAllExcept(ServerInstance->FakeClient, true, '%', empty, "NOTICE %s :*** Timed ban on %s expired.", cr->name.c_str(), safei->mask.c_str());
-                                               ServerInstance->PI->SendChannelNotice(cr, '%', "*** Timed ban on " + safei->mask + " expired.");
+                                               cr->WriteAllExcept(ServerInstance->FakeClient, true, '%', empty, "NOTICE %s :%s", cr->name.c_str(), expiry.c_str());
+                                               ServerInstance->PI->SendChannelNotice(cr, '%', expiry);
                                        }
 
-                                       /* 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);
+                                       ServerInstance->PI->SendMode(chan, ServerInstance->Modes->GetLastParseParams(), ServerInstance->Modes->GetLastParseTranslate());
                                }
                        }
+                       else
+                               ++i;
                }
        }