Chain ValidateServerName onto ValidateHostname so that the servername gets hostname...

[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..4eea2e44d523766130d512577496b954f57061b6 100644 (file)
--- a/src/modes/cmode_b.cpp
+++ b/src/modes/cmode_b.cpp
@@ -49,7 +49,7 @@ 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];
@@ -61,13 +61,20 @@ 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
+               {
+                       sprintf(moderemove,"-%c",this->GetModeChar());
+                       const char* parameters[] = { channel->name, moderemove, i->data };
+                       ServerInstance->SendMode(parameters, 3, ServerInstance->FakeClient);
+               }
        }
 }
 
-void ModeChannelBan::RemoveMode(User*)
+void ModeChannelBan::RemoveMode(User*, irc::modestacker* stack)
 {
 }
 
@@ -76,7 +83,7 @@ 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, channel->name, i->data, i->set_by, (unsigned long)i->set_time);
        }
        user->WriteServ("368 %s %s :End of channel ban list",user->nick, channel->name);
        return;
@@ -91,7 +98,7 @@ std::string& ModeChannelBan::AddBan(User *user, std::string &dest, Channel *chan
 {
        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;
        }
@@ -105,7 +112,7 @@ std::string& ModeChannelBan::AddBan(User *user, std::string &dest, Channel *chan
        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);
+               user->WriteServ("478 %s %s :Channel ban list for %s is full (maximum entries for this channel is %ld)",user->nick, chan->name,chan->name,maxbans);
                dest = "";
                return dest;
        }
@@ -151,7 +158,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;
        }