X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodes%2Fcmode_b.cpp;h=305c91ea45e100bdf46168aa402bb45c661e3694;hb=5db3290d939509015167b7fdfba5073285051560;hp=5a6960831828864de283af3ff9374829ad80827b;hpb=a7cbd51d457a5e3b435396092bc7e2fcf79168e1;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modes/cmode_b.cpp b/src/modes/cmode_b.cpp index 5a6960831..305c91ea4 100644 --- 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 @@ -11,16 +11,15 @@ * --------------------------------------------------- */ +#include "inspircd.h" #include #include #include "inspircd_config.h" #include "configreader.h" #include "hash_map.h" -#include "inspircd.h" #include "mode.h" #include "channels.h" #include "users.h" - #include "modules.h" #include "inspstring.h" #include "hashcomp.h" @@ -30,13 +29,13 @@ ModeChannelBan::ModeChannelBan(InspIRCd* Instance) : ModeHandler(Instance, 'b', { } -ModeAction ModeChannelBan::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) +ModeAction ModeChannelBan::OnModeChange(User* source, User*, Channel* channel, std::string ¶meter, 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 { @@ -50,47 +49,54 @@ ModeAction ModeChannelBan::OnModeChange(userrec* source, userrec* dest, chanrec* return MODEACTION_ALLOW; } -void ModeChannelBan::RemoveMode(chanrec* channel) +void ModeChannelBan::RemoveMode(Channel* channel, irc::modestacker* stack) { 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); + if (stack) + { + stack->Push(this->GetModeChar(), i->data); + } + else + { + std::vector parameters; parameters.push_back(channel->name); parameters.push_back("-b"); parameters.push_back(i->data); + ServerInstance->SendMode(parameters, ServerInstance->FakeClient); + } } - - delete n; } -void ModeChannelBan::RemoveMode(userrec* user) +void ModeChannelBan::RemoveMode(User*, irc::modestacker* stack) { } -void ModeChannelBan::DisplayList(userrec* user, chanrec* channel) +void ModeChannelBan::DisplayList(User* user, Channel* channel) { /* Display the channel banlist */ - for (BanList::iterator i = channel->bans.begin(); i != channel->bans.end(); i++) + 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; } -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.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; } @@ -102,9 +108,9 @@ std::string& ModeChannelBan::AddBan(userrec *user,std::string &dest,chanrec *cha 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; } @@ -119,7 +125,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.c_str(), dest.c_str())) { /* dont allow a user to set the same ban twice */ dest = ""; @@ -128,24 +134,17 @@ 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); - } + 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; } -ModePair ModeChannelBan::ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string ¶meter) +ModePair ModeChannelBan::ModeSet(User*, User*, Channel* channel, const std::string ¶meter) { 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); } @@ -153,11 +152,11 @@ 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)) { - 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; } @@ -167,10 +166,10 @@ std::string& ModeChannelBan::DelBan(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.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 = "";