Annotations

[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 dc5f8f977087c41432e1aeae617de6915fb133f2..a1f4411c3066bf93f18354a28f855cfc1b995b2c 100644 (file)
--- a/src/modules/m_timedbans.cpp
+++ b/src/modules/m_timedbans.cpp
@@ -23,7 +23,7 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "hashcomp.h"
 #include "configreader.h"
 #include "inspircd.h"
@@ -51,7 +51,7 @@ class cmd_tban : public command_t
                syntax = "<channel> <duration> <banmask>";
        }
 
-       void Handle (const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
        {
                chanrec* channel = ServerInstance->FindChan(parameters[0]);
                if (channel)
@@ -62,26 +62,26 @@ class cmd_tban : public command_t
                                if (!ServerInstance->IsValidMask(parameters[2]))
                                {
                                        user->WriteServ("NOTICE "+std::string(user->nick)+" :Invalid ban mask");
-                                       return;
+                                       return CMD_FAILURE;
                                }
                                for (BanList::iterator i = channel->bans.begin(); i != channel->bans.end(); i++)
                                {
                                        if (!strcasecmp(i->data,parameters[2]))
                                        {
                                                user->WriteServ("NOTICE "+std::string(user->nick)+" :The ban "+std::string(parameters[2])+" is already on the banlist of "+std::string(parameters[0]));
-                                               return;
+                                               return CMD_FAILURE;
                                        }
                                }
                                TimedBan T;
                                std::string channelname = parameters[0];
-                               unsigned long expire = ServerInstance->duration(parameters[1]) + time(NULL);
-                               if (ServerInstance->duration(parameters[1]) < 1)
+                               unsigned long expire = ServerInstance->Duration(parameters[1]) + time(NULL);
+                               if (ServerInstance->Duration(parameters[1]) < 1)
                                {
                                        user->WriteServ("NOTICE "+std::string(user->nick)+" :Invalid ban time");
-                                       return;
+                                       return CMD_FAILURE;
                                }
                                char duration[MAXBUF];
-                               snprintf(duration,MAXBUF,"%lu",ServerInstance->duration(parameters[1]));
+                               snprintf(duration,MAXBUF,"%lu",ServerInstance->Duration(parameters[1]));
                                std::string mask = parameters[2];
                                const char *setban[32];
                                setban[0] = parameters[0];
@@ -102,13 +102,15 @@ class cmd_tban : public command_t
                                        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);
+                                       return CMD_SUCCESS;
                                }
-                               return;
+                               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);
-                       return;
+                       return CMD_FAILURE;
                }
                user->WriteServ("401 %s %s :No such channel",user->nick, parameters[0]);
+               return CMD_FAILURE;
        }
 };
 
@@ -137,11 +139,13 @@ class ModuleTimedBans : public Module
 
        virtual int OnDelBan(userrec* source, chanrec* 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 listitem = banmask.c_str();
                        irc::string target = i->mask.c_str();
-                       if (listitem == target)
+                       irc::string tchan = i->channel.c_str();
+                       if ((listitem == target) && (tchan == thischan))
                        {
                                TimedBanList.erase(i);
                                break;
@@ -175,14 +179,13 @@ class ModuleTimedBans : public Module
                                                // hash and set its descriptor to FD_MAGIC_NUMBER so the data
                                                // falls into the abyss :p
                                                userrec* temp = new userrec(ServerInstance);
-                                               temp->fd = FD_MAGIC_NUMBER;
-                                               temp->server = "";
-                                               ServerInstance->SendMode(setban,3,temp);
+                                               temp->SetFd(FD_MAGIC_NUMBER);
                                                 /* FIX: Send mode remotely*/
                                                 std::deque<std::string> n;
-                                                n.push_back(i->channel);
+                                                n.push_back(setban[0]);
                                                 n.push_back("-b");
-                                                n.push_back(i->mask);
+                                                n.push_back(setban[2]);
+                                               ServerInstance->SendMode(setban,3,temp);
                                                 Event rmode((char *)&n, NULL, "send_mode");
                                                 rmode.Send(ServerInstance);
                                                DELETE(temp);