Finally apply my patch simplifying RSQUIT. Fixes bug #452, reported by Mark. This...

[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 a411dade9dc349fcd6a27180f219c0d159360495..4be32ffc2f14c22175a303d524d2b81f501fdf9c 100644 (file)
--- a/src/modules/m_timedbans.cpp
+++ b/src/modules/m_timedbans.cpp
@@ -40,7 +40,7 @@ class CommandTban : public Command
                TRANSLATE4(TR_TEXT, TR_TEXT, TR_TEXT, TR_END);
        }
 
-       CmdResult Handle (const char** parameters, int pcnt, User *user)
+       CmdResult Handle (const char* const* parameters, int pcnt, User *user)
        {
                Channel* channel = ServerInstance->FindChan(parameters[0]);
                if (channel)
@@ -85,20 +85,22 @@ class CommandTban : public Command
                                                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 %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);
+                                       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%soperator 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;
        }
 };
@@ -155,20 +157,18 @@ class ModuleTimedBans : public Module
                                        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();
 
-                                               /* Send mode remotely*/
-                                               std::deque<std::string> n;
-                                               n.push_back(setban[0]);
-                                               n.push_back("-b");
-                                               n.push_back(setban[2]);
+                                               ServerInstance->PI->SendModeStr(i->channel, std::string("-b ") + setban[2]);
                                                ServerInstance->SendMode(setban,3, ServerInstance->FakeClient);
-                                               Event rmode((char *)&n, NULL, "send_mode");
-                                               rmode.Send(ServerInstance);
+
+                                               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
                                        {
@@ -184,7 +184,7 @@ class ModuleTimedBans : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
        }
 };