Fix desync with halfop and voice when opped (this happens because we were ORing the...

[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 8db699b192344146fb2b1ba58bcb6a942001fa76..5a6960831828864de283af3ff9374829ad80827b 100644 (file)
--- a/src/modes/cmode_b.cpp
+++ b/src/modes/cmode_b.cpp
@@ -1,3 +1,16 @@
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
 #include <string>
 #include <vector>
 #include "inspircd_config.h"
@@ -7,27 +20,19 @@
 #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 ServerConfig* Config;
-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)
        {
@@ -45,6 +50,31 @@ ModeAction ModeChannelBan::OnModeChange(userrec* source, userrec* dest, chanrec*
        return MODEACTION_ALLOW;
 }
 
+void ModeChannelBan::RemoveMode(chanrec* channel)
+{
+       BanList copy;
+       char moderemove[MAXBUF];
+       userrec* n = new userrec(ServerInstance);
+       n->SetFd(FD_MAGIC_NUMBER);
+
+       for (BanList::iterator i = channel->bans.begin(); i != channel->bans.end(); i++)
+       {
+               copy.push_back(*i);
+       }
+       for (BanList::iterator i = copy.begin(); i != copy.end(); i++)
+       {
+               sprintf(moderemove,"-%c",this->GetModeChar());
+               const char* parameters[] = { channel->name, moderemove, i->data };
+               ServerInstance->SendMode(parameters, 3, n);
+       }
+
+       delete n;
+}
+
+void ModeChannelBan::RemoveMode(userrec* user)
+{
+}
+
 void ModeChannelBan::DisplayList(userrec* user, chanrec* channel)
 {
        /* Display the channel banlist */
@@ -60,7 +90,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 +101,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 +127,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)
        {
@@ -105,7 +135,7 @@ std::string& ModeChannelBan::AddBan(userrec *user,std::string &dest,chanrec *cha
        }
        else
        {
-               strlcpy(b.set_by,Config->ServerName,NICKMAX-1);
+               strlcpy(b.set_by,ServerInstance->Config->ServerName,NICKMAX-1);
        }
        chan->bans.push_back(b);
        return dest;
@@ -127,7 +157,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;
        }