Document TimerManager class

[user/henk/code/inspircd.git] / src / modes / cmode_b.cpp

diff --git a/src/modes/cmode_b.cpp b/src/modes/cmode_b.cpp
index 47913bdc035ef1b6a7a8feaa3e2ed3fa32add2dd..82e57ea7bb1e3bddd406482b9b4dfa6dc560a1fe 100644 (file)
--- a/src/modes/cmode_b.cpp
+++ b/src/modes/cmode_b.cpp
@@ -8,26 +8,18 @@
 #include "channels.h"
 #include "users.h"
 #include "helperfuncs.h"
-#include "message.h"
 #include "modules.h"
 #include "inspstring.h"
 #include "hashcomp.h"
 #include "modes/cmode_b.h"
 
-extern InspIRCd* ServerInstance;
-extern InspIRCd* ServerInstance;
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
-extern int MODCOUNT;
-extern time_t TIME;
-
-ModeChannelBan::ModeChannelBan() : ModeHandler('b', 1, 1, true, MODETYPE_CHANNEL, false)
+ModeChannelBan::ModeChannelBan(InspIRCd* Instance) : ModeHandler(Instance, 'b', 1, 1, true, MODETYPE_CHANNEL, false)
 {
 }
 
 ModeAction ModeChannelBan::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
 {
-       int status = cstatus(source, channel);
+       int status = channel->GetStatus(source);
        /* Call the correct method depending on wether we're adding or removing the mode */
        if (adding)
        {
@@ -60,7 +52,7 @@ std::string& ModeChannelBan::AddBan(userrec *user,std::string &dest,chanrec *cha
 {
        if ((!user) || (!chan))
        {
-               log(DEFAULT,"*** BUG *** AddBan was given an invalid parameter");
+               ServerInstance->Log(DEFAULT,"*** BUG *** AddBan was given an invalid parameter");
                dest = "";
                return dest;
        }
@@ -71,7 +63,7 @@ std::string& ModeChannelBan::AddBan(userrec *user,std::string &dest,chanrec *cha
        if (dest == "")
                return dest;
 
-       long maxbans = GetMaxBans(chan->name);
+       long maxbans = chan->GetMaxBans();
        if ((unsigned)chan->bans.size() > (unsigned)maxbans)
        {
                user->WriteServ("478 %s %s :Channel ban list for %s is full (maximum entries for this channel is %d)",user->nick, chan->name,chan->name,maxbans);
@@ -97,7 +89,7 @@ std::string& ModeChannelBan::AddBan(userrec *user,std::string &dest,chanrec *cha
                }
        }
 
-       b.set_time = TIME;
+       b.set_time = ServerInstance->Time();
        strlcpy(b.data,dest.c_str(),MAXBUF);
        if (*user->nick)
        {
@@ -127,7 +119,7 @@ std::string& ModeChannelBan::DelBan(userrec *user,std::string& dest,chanrec *cha
 {
        if ((!user) || (!chan))
        {
-               log(DEFAULT,"*** BUG *** TakeBan was given an invalid parameter");
+               ServerInstance->Log(DEFAULT,"*** BUG *** TakeBan was given an invalid parameter");
                dest = "";
                return dest;
        }