Someone please help me fix the warnings in modules caused by this change. All mode...

[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 e306f31f6fffcc9995b1b8f480e4959ca4659375..bedd4b6b6fdc5f99a171f9a6dbc635db6a8d786f 100644 (file)
--- a/src/modes/cmode_b.cpp
+++ b/src/modes/cmode_b.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -29,13 +29,13 @@ ModeChannelBan::ModeChannelBan(InspIRCd* Instance) : ModeHandler(Instance, 'b',
 {
 }
 
-ModeAction ModeChannelBan::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+ModeAction ModeChannelBan::OnModeChange(User* source, User*, Channel* channel, std::string &parameter, bool adding, bool servermode)
 {
        int status = channel->GetStatus(source);
        /* Call the correct method depending on wether we're adding or removing the mode */
        if (adding)
        {
-               parameter = this->AddBan(source, parameter, channel, status);
+               parameter = this->AddBan(source, parameter, channel, status, servermode);
        }
        else
        {
@@ -49,32 +49,29 @@ ModeAction ModeChannelBan::OnModeChange(userrec* source, userrec* dest, chanrec*
        return MODEACTION_ALLOW;
 }
 
-void ModeChannelBan::RemoveMode(chanrec* channel)
+void ModeChannelBan::RemoveMode(Channel* 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);
+               ServerInstance->SendMode(parameters, 3, ServerInstance->FakeClient);
        }
-
-       delete n;
 }
 
-void ModeChannelBan::RemoveMode(userrec* user)
+void ModeChannelBan::RemoveMode(User*)
 {
 }
 
-void ModeChannelBan::DisplayList(userrec* user, chanrec* channel)
+void ModeChannelBan::DisplayList(User* user, Channel* channel)
 {
        /* Display the channel banlist */
        for (BanList::reverse_iterator i = channel->bans.rbegin(); i != channel->bans.rend(); ++i)
@@ -85,7 +82,12 @@ void ModeChannelBan::DisplayList(userrec* user, chanrec* channel)
        return;
 }
 
-std::string& ModeChannelBan::AddBan(userrec *user,std::string &dest,chanrec *chan,int status)
+void ModeChannelBan::DisplayEmptyList(User* user, Channel* channel)
+{
+       user->WriteServ("368 %s %s :End of channel ban list",user->nick, channel->name);
+}
+
+std::string& ModeChannelBan::AddBan(User *user, std::string &dest, Channel *chan, int, bool servermode)
 {
        if ((!user) || (!chan))
        {
@@ -118,7 +120,7 @@ std::string& ModeChannelBan::AddBan(userrec *user,std::string &dest,chanrec *cha
 
        for (BanList::iterator i = chan->bans.begin(); i != chan->bans.end(); i++)
        {
-               if (!strcasecmp(i->data,dest.c_str()))
+               if (!strcasecmp(i->data, dest.c_str()))
                {
                        /* dont allow a user to set the same ban twice */
                        dest = "";
@@ -127,20 +129,13 @@ std::string& ModeChannelBan::AddBan(userrec *user,std::string &dest,chanrec *cha
        }
 
        b.set_time = ServerInstance->Time();
-       strlcpy(b.data,dest.c_str(),MAXBUF);
-       if (*user->nick)
-       {
-               strlcpy(b.set_by,user->nick,NICKMAX-1);
-       }
-       else
-       {
-               strlcpy(b.set_by,ServerInstance->Config->ServerName,NICKMAX-1);
-       }
+       strlcpy(b.data, dest.c_str(), MAXBUF);
+       strlcpy(b.set_by, servermode ? ServerInstance->Config->ServerName : user->nick, 63);
        chan->bans.push_back(b);
        return dest;
 }
 
-ModePair ModeChannelBan::ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+ModePair ModeChannelBan::ModeSet(User*, User*, Channel* channel, const std::string &parameter)
 {
        for (BanList::iterator i = channel->bans.begin(); i != channel->bans.end(); i++)
        {
@@ -152,7 +147,7 @@ ModePair ModeChannelBan::ModeSet(userrec* source, userrec* dest, chanrec* channe
         return std::make_pair(false, parameter);
 }
 
-std::string& ModeChannelBan::DelBan(userrec *user,std::string& dest,chanrec *chan,int status)
+std::string& ModeChannelBan::DelBan(User *user, std::string& dest, Channel *chan, int)
 {
        if ((!user) || (!chan))
        {