Set the parameter of -b to the banmask actually removed

[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 034a93a859feeba9b85f04d9677edfe4b1c550a7..e45f191f78d330a1ce280b9ec93f6827dc6611c3 100644 (file)
--- a/src/modes/cmode_b.cpp
+++ b/src/modes/cmode_b.cpp
@@ -43,11 +43,11 @@ ModeAction ModeChannelBan::OnModeChange(User* source, User*, Channel* channel, s
        /* Call the correct method depending on wether we're adding or removing the mode */
        if (adding)
        {
-               parameter = this->AddBan(source, parameter, channel, status);
+               this->AddBan(source, parameter, channel, status);
        }
        else
        {
-               parameter = this->DelBan(source, parameter, channel, status);
+               this->DelBan(source, parameter, channel, status);
        }
        /* If the method above 'ate' the parameter by reducing it to an empty string, then
         * it won't matter wether we return ALLOW or DENY here, as an empty string overrides
@@ -105,21 +105,21 @@ std::string& ModeChannelBan::AddBan(User *user, std::string &dest, Channel *chan
        if ((!user) || (!chan))
        {
                ServerInstance->Logs->Log("MODE",DEFAULT,"*** BUG *** AddBan was given an invalid parameter");
-               dest = "";
+               dest.clear();
                return dest;
        }
 
        /* Attempt to tidy the mask */
        ModeParser::CleanMask(dest);
        /* If the mask was invalid, we exit */
-       if (dest == "" || dest.length() > 250)
+       if (dest.empty() || dest.length() > 250)
                return dest;
 
        long maxbans = chan->GetMaxBans();
-       if (!IS_LOCAL(user) && ((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 %ld)",user->nick.c_str(), chan->name.c_str(), chan->name.c_str(), maxbans);
-               dest = "";
+               dest.clear();
                return dest;
        }
 
@@ -127,7 +127,7 @@ std::string& ModeChannelBan::AddBan(User *user, std::string &dest, Channel *chan
        FIRST_MOD_RESULT(OnAddBan, MOD_RESULT, (user,chan,dest));
        if (MOD_RESULT == MOD_RES_DENY)
        {
-               dest = "";
+               dest.clear();
                return dest;
        }
 
@@ -136,7 +136,7 @@ std::string& ModeChannelBan::AddBan(User *user, std::string &dest, Channel *chan
                if (i->data == dest)
                {
                        /* dont allow a user to set the same ban twice */
-                       dest = "";
+                       dest.clear();
                        return dest;
                }
        }
@@ -153,7 +153,7 @@ std::string& ModeChannelBan::DelBan(User *user, std::string& dest, Channel *chan
        if ((!user) || (!chan))
        {
                ServerInstance->Logs->Log("MODE",DEFAULT,"*** BUG *** TakeBan was given an invalid parameter");
-               dest = "";
+               dest.clear();
                return dest;
        }
 
@@ -165,14 +165,15 @@ std::string& ModeChannelBan::DelBan(User *user, std::string& dest, Channel *chan
                        FIRST_MOD_RESULT(OnDelBan, MOD_RESULT, (user, chan, dest));
                        if (MOD_RESULT == MOD_RES_DENY)
                        {
-                               dest = "";
+                               dest.clear();
                                return dest;
                        }
+                       dest = i->data;
                        chan->bans.erase(i);
                        return dest;
                }
        }
-       dest = "";
+       dest.clear();
        return dest;
 }