Fix these too!

[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 5db5753bd9df84c44cc76ae522d6a19fdc78baa3..3783590ccd135235f0a57ef6252854e5dd2d7306 100644 (file)
--- a/src/modules/m_timedbans.cpp
+++ b/src/modules/m_timedbans.cpp
@@ -23,14 +23,13 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
 #include "hashcomp.h"
 #include "configreader.h"
 #include "inspircd.h"
 
-static Server *Srv;
-extern InspIRCd* ServerInstance;
 
+/** Holds a timed ban
+ */
 class TimedBan : public classbase
 {
  public:
@@ -42,16 +41,18 @@ class TimedBan : public classbase
 typedef std::vector<TimedBan> timedbans;
 timedbans TimedBanList;
 
+/** Handle /TBAN
+ */
 class cmd_tban : public command_t
 {
  public:
-       cmd_tban () : command_t("TBAN", 0, 3)
+ cmd_tban (InspIRCd* Instance) : command_t(Instance,"TBAN", 0, 3)
        {
                this->source = "m_timedbans.so";
                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)
@@ -59,29 +60,29 @@ class cmd_tban : public command_t
                        int cm = channel->GetStatus(user);
                        if ((cm == STATUS_HOP) || (cm == STATUS_OP))
                        {
-                               if (!Srv->IsValidMask(parameters[2]))
+                               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 = Srv->CalcDuration(parameters[1]) + time(NULL);
-                               if (Srv->CalcDuration(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",Srv->CalcDuration(parameters[1]));
+                               snprintf(duration,MAXBUF,"%lu",ServerInstance->Duration(parameters[1]));
                                std::string mask = parameters[2];
                                const char *setban[32];
                                setban[0] = parameters[0];
@@ -89,7 +90,7 @@ class cmd_tban : public command_t
                                setban[2] = parameters[2];
                                // use CallCommandHandler to make it so that the user sets the mode
                                // themselves
-                               Srv->CallCommandHandler("MODE",setban,3,user);
+                               ServerInstance->CallCommandHandler("MODE",setban,3,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++)
@@ -102,13 +103,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;
        }
 };
 
@@ -116,12 +119,12 @@ class ModuleTimedBans : public Module
 {
        cmd_tban* mycommand;
  public:
-       ModuleTimedBans(Server* Me)
+       ModuleTimedBans(InspIRCd* Me)
                : Module::Module(Me)
        {
-               Srv = Me;
-               mycommand = new cmd_tban();
-               Srv->AddCommand(mycommand);
+               
+               mycommand = new cmd_tban(ServerInstance);
+               ServerInstance->AddCommand(mycommand);
                TimedBanList.clear();
        }
        
@@ -137,11 +140,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,16 +180,15 @@ 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 = "";
-                                               Srv->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();
+                                                rmode.Send(ServerInstance);
                                                DELETE(temp);
                                        }
                                        else
@@ -201,7 +205,7 @@ class ModuleTimedBans : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,0,VF_VENDOR);
+               return Version(1,1,0,0,VF_VENDOR,API_VERSION);
        }
 };
 
@@ -217,7 +221,7 @@ class ModuleTimedBansFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleTimedBans(Me);
        }