After discussions and thought, move umode +n to +s. This increases cross-ircd compat...

[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 bedd4b6b6fdc5f99a171f9a6dbc635db6a8d786f..305c91ea45e100bdf46168aa402bb45c661e3694 100644 (file)
--- a/src/modes/cmode_b.cpp
+++ b/src/modes/cmode_b.cpp
@@ -49,10 +49,9 @@ ModeAction ModeChannelBan::OnModeChange(User* source, User*, Channel* channel, s
        return MODEACTION_ALLOW;
 }
 
-void ModeChannelBan::RemoveMode(Channel* channel)
+void ModeChannelBan::RemoveMode(Channel* channel, irc::modestacker* stack)
 {
        BanList copy;
-       char moderemove[MAXBUF];
 
        for (BanList::iterator i = channel->bans.begin(); i != channel->bans.end(); i++)
        {
@@ -61,13 +60,19 @@ void ModeChannelBan::RemoveMode(Channel* channel)
 
        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, ServerInstance->FakeClient);
+               if (stack)
+               {
+                       stack->Push(this->GetModeChar(), i->data);
+               }
+               else
+               {
+                       std::vector<std::string> parameters; parameters.push_back(channel->name); parameters.push_back("-b"); parameters.push_back(i->data);
+                       ServerInstance->SendMode(parameters, ServerInstance->FakeClient);
+               }
        }
 }
 
-void ModeChannelBan::RemoveMode(User*)
+void ModeChannelBan::RemoveMode(User*, irc::modestacker* stack)
 {
 }
 
@@ -76,22 +81,22 @@ void ModeChannelBan::DisplayList(User* user, Channel* channel)
        /* Display the channel banlist */
        for (BanList::reverse_iterator i = channel->bans.rbegin(); i != channel->bans.rend(); ++i)
        {
-               user->WriteServ("367 %s %s %s %s %d",user->nick, channel->name, i->data, i->set_by, i->set_time);
+               user->WriteServ("367 %s %s %s %s %lu",user->nick.c_str(), channel->name.c_str(), i->data.c_str(), i->set_by.c_str(), (unsigned long)i->set_time);
        }
-       user->WriteServ("368 %s %s :End of channel ban list",user->nick, channel->name);
+       user->WriteServ("368 %s %s :End of channel ban list",user->nick.c_str(), channel->name.c_str());
        return;
 }
 
 void ModeChannelBan::DisplayEmptyList(User* user, Channel* channel)
 {
-       user->WriteServ("368 %s %s :End of channel ban list",user->nick, channel->name);
+       user->WriteServ("368 %s %s :End of channel ban list",user->nick.c_str(), channel->name.c_str());
 }
 
 std::string& ModeChannelBan::AddBan(User *user, std::string &dest, Channel *chan, int, bool servermode)
 {
        if ((!user) || (!chan))
        {
-               ServerInstance->Log(DEFAULT,"*** BUG *** AddBan was given an invalid parameter");
+               ServerInstance->Logs->Log("MODE",DEFAULT,"*** BUG *** AddBan was given an invalid parameter");
                dest = "";
                return dest;
        }
@@ -103,9 +108,9 @@ std::string& ModeChannelBan::AddBan(User *user, std::string &dest, Channel *chan
                return dest;
 
        long maxbans = chan->GetMaxBans();
-       if ((unsigned)chan->bans.size() > (unsigned)maxbans)
+       if (!IS_LOCAL(user) && ((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);
+               user->WriteServ("478 %s %s :Channel ban list for %s is full (maximum entries for this channel is %ld)",user->nick.c_str(), chan->name.c_str(), chan->name.c_str(), maxbans);
                dest = "";
                return dest;
        }
@@ -120,7 +125,7 @@ std::string& ModeChannelBan::AddBan(User *user, std::string &dest, Channel *chan
 
        for (BanList::iterator i = chan->bans.begin(); i != chan->bans.end(); i++)
        {
-               if (!strcasecmp(i->data, dest.c_str()))
+               if (!strcasecmp(i->data.c_str(), dest.c_str()))
                {
                        /* dont allow a user to set the same ban twice */
                        dest = "";
@@ -129,8 +134,8 @@ std::string& ModeChannelBan::AddBan(User *user, std::string &dest, Channel *chan
        }
 
        b.set_time = ServerInstance->Time();
-       strlcpy(b.data, dest.c_str(), MAXBUF);
-       strlcpy(b.set_by, servermode ? ServerInstance->Config->ServerName : user->nick, 63);
+       b.data.assign(dest, 0, MAXBUF);
+       b.set_by.assign(servermode ? ServerInstance->Config->ServerName : user->nick, 0, 64);
        chan->bans.push_back(b);
        return dest;
 }
@@ -139,7 +144,7 @@ ModePair ModeChannelBan::ModeSet(User*, User*, Channel* channel, const std::stri
 {
        for (BanList::iterator i = channel->bans.begin(); i != channel->bans.end(); i++)
        {
-               if (!strcasecmp(i->data,parameter.c_str()))
+               if (!strcasecmp(i->data.c_str(), parameter.c_str()))
                {
                        return std::make_pair(true, i->data);
                }
@@ -151,7 +156,7 @@ std::string& ModeChannelBan::DelBan(User *user, std::string& dest, Channel *chan
 {
        if ((!user) || (!chan))
        {
-               ServerInstance->Log(DEFAULT,"*** BUG *** TakeBan was given an invalid parameter");
+               ServerInstance->Logs->Log("MODE",DEFAULT,"*** BUG *** TakeBan was given an invalid parameter");
                dest = "";
                return dest;
        }
@@ -161,10 +166,10 @@ std::string& ModeChannelBan::DelBan(User *user, std::string& dest, Channel *chan
 
        for (BanList::iterator i = chan->bans.begin(); i != chan->bans.end(); i++)
        {
-               if (!strcasecmp(i->data,dest.c_str()))
+               if (!strcasecmp(i->data.c_str(), dest.c_str()))
                {
                        int MOD_RESULT = 0;
-                       FOREACH_RESULT(I_OnDelBan,OnDelBan(user,chan,dest));
+                       FOREACH_RESULT(I_OnDelBan,OnDelBan(user, chan, dest));
                        if (MOD_RESULT)
                        {
                                dest = "";