auto-set +s when +n is set (as +n requires +s) - allow +n to be 'set twice' allowing...

[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 d03213f2e6ee79c4c8147bd7c462dd3103de4213..546bcb30fe82bd26fdfebd161f2bfe333d69ace3 100644 (file)
--- a/src/modes/cmode_b.cpp
+++ b/src/modes/cmode_b.cpp
@@ -7,21 +7,13 @@
 #include "mode.h"
 #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)
 {
 }
 
@@ -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;
        }
@@ -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;
        }