X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodes%2Fcmode_b.cpp;h=36078f4b2aae3fc3f5a25998178ec346d96b3929;hb=86775e2e98f55b3b88befe2daff0ca23f02f3155;hp=57e13159d9138172b847e82490a5f4dcbd061953;hpb=2e6b07ea37c935bd173795cc9e1ad37a4ebececc;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modes/cmode_b.cpp b/src/modes/cmode_b.cpp index 57e13159d..36078f4b2 100644 --- a/src/modes/cmode_b.cpp +++ b/src/modes/cmode_b.cpp @@ -1,88 +1,123 @@ +/* +------------------------------------+ + * | Inspire Internet Relay Chat Daemon | + * +------------------------------------+ + * + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits + * + * This program is free but copyrighted software; see + * the file COPYING for details. + * + * --------------------------------------------------- + */ + +#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 "helperfuncs.h" -#include "message.h" #include "modules.h" #include "inspstring.h" #include "hashcomp.h" #include "modes/cmode_b.h" -extern InspIRCd* ServerInstance; -extern ServerConfig* Config; -extern std::vector modules; -extern std::vector factory; -extern int MODCOUNT; -extern time_t TIME; - -ModeChannelBan::ModeChannelBan() : ModeHandler('b', 1, 1, true, MODETYPE_CHANNEL, false) +ModeChannelBan::ModeChannelBan(InspIRCd* Instance) : ModeHandler(Instance, NULL, 'b', 1, 1, true, MODETYPE_CHANNEL, false) { } -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) { - int status = cstatus(source, channel); - adding ? parameter = this->AddBan(source, parameter, channel, status) : parameter = this->DelBan(source, parameter, channel, status); + 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); + } + else + { + parameter = 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 + * the return value and is always MODEACTION_DENY if the mode is supposed to have + * a parameter. + */ return MODEACTION_ALLOW; } -std::string& ModeChannelBan::AddBan(userrec *user,std::string &dest,chanrec *chan,int status) +void ModeChannelBan::RemoveMode(Channel* channel, irc::modestacker* stack) { - BanItem b; - int toomanyexclamation = 0; - int toomanyat = 0; + BanList copy; - if ((!user) || (!chan)) + for (BanList::iterator i = channel->bans.begin(); i != channel->bans.end(); i++) { - log(DEFAULT,"*** BUG *** AddBan was given an invalid parameter"); - dest = ""; - return dest; + copy.push_back(*i); } - for (std::string::iterator i = dest.begin(); i != dest.end(); i++) + for (BanList::iterator i = copy.begin(); i != copy.end(); i++) { - if ((*i < 32) || (*i > 126)) + if (stack) { - dest = ""; - return dest; - } - else if (*i == '!') - { - toomanyexclamation++; + stack->Push(this->GetModeChar(), i->data); } - else if (*i == '@') + else { - toomanyat++; + std::vector parameters; parameters.push_back(channel->name); parameters.push_back("-b"); parameters.push_back(i->data); + ServerInstance->SendMode(parameters, ServerInstance->FakeClient); } } +} - if (toomanyexclamation != 1 || toomanyat != 1) +void ModeChannelBan::RemoveMode(User*, irc::modestacker* stack) +{ +} + +void ModeChannelBan::DisplayList(User* user, Channel* channel) +{ + /* Display the channel banlist */ + for (BanList::reverse_iterator i = channel->bans.rbegin(); i != channel->bans.rend(); ++i) { - /* - * this stops sillyness like n!u!u!u@h, though note that most - * ircds don't actually verify banmask validity. --w00t - */ + 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.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.c_str(), channel->name.c_str()); +} + +std::string& ModeChannelBan::AddBan(User *user, std::string &dest, Channel *chan, int) +{ + if ((!user) || (!chan)) + { + ServerInstance->Logs->Log("MODE",DEFAULT,"*** BUG *** AddBan was given an invalid parameter"); dest = ""; return dest; } - long maxbans = GetMaxBans(chan->name); - if ((unsigned)chan->bans.size() > (unsigned)maxbans) + /* Attempt to tidy the mask */ + ModeParser::CleanMask(dest); + /* If the mask was invalid, we exit */ + if (dest == "") + return dest; + + long maxbans = chan->GetMaxBans(); + if (!IS_LOCAL(user) && ((unsigned)chan->bans.size() > (unsigned)maxbans)) { - WriteServ(user->fd,"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; } - int MOD_RESULT = 0; - FOREACH_RESULT(I_OnAddBan,OnAddBan(user,chan,dest)); - if (MOD_RESULT) + ModResult MOD_RESULT; + FIRST_MOD_RESULT(ServerInstance, OnAddBan, MOD_RESULT, (user,chan,dest)); + if (MOD_RESULT == MOD_RES_DENY) { dest = ""; return dest; @@ -90,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 (i->data == dest) { /* dont allow a user to set the same ban twice */ dest = ""; @@ -98,36 +133,44 @@ std::string& ModeChannelBan::AddBan(userrec *user,std::string &dest,chanrec *cha } } - b.set_time = TIME; - strlcpy(b.data,dest.c_str(),MAXBUF); - if (*user->nick) - { - strlcpy(b.set_by,user->nick,NICKMAX-1); - } - else - { - strlcpy(b.set_by,Config->ServerName,NICKMAX-1); - } + b.set_time = ServerInstance->Time(); + b.data.assign(dest, 0, MAXBUF); + b.set_by.assign(user->nick, 0, 64); chan->bans.push_back(b); return dest; } -std::string& ModeChannelBan::DelBan(userrec *user,std::string& dest,chanrec *chan,int status) +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.c_str(), parameter.c_str())) + { + return std::make_pair(true, i->data); + } + } + return std::make_pair(false, parameter); +} + +std::string& ModeChannelBan::DelBan(User *user, std::string& dest, Channel *chan, int) { if ((!user) || (!chan)) { - log(DEFAULT,"*** BUG *** TakeBan was given an invalid parameter"); + ServerInstance->Logs->Log("MODE",DEFAULT,"*** BUG *** TakeBan was given an invalid parameter"); dest = ""; return dest; } + /* 'Clean' the mask, e.g. nick -> nick!*@* */ + ModeParser::CleanMask(dest); + 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)); - if (MOD_RESULT) + ModResult MOD_RESULT; + FIRST_MOD_RESULT(ServerInstance, OnDelBan, MOD_RESULT, (user, chan, dest)); + if (MOD_RESULT == MOD_RES_DENY) { dest = ""; return dest;