X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodes%2Fcmode_b.cpp;h=1efb5d399e31d7d79930bc09e5de14ad130dc260;hb=1290b11508cb44d74e248860f3bfddf32efd878b;hp=d03213f2e6ee79c4c8147bd7c462dd3103de4213;hpb=dafc021be4f3ad34ca37953de6a0109a161dd165;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modes/cmode_b.cpp b/src/modes/cmode_b.cpp index d03213f2e..1efb5d399 100644 --- a/src/modes/cmode_b.cpp +++ b/src/modes/cmode_b.cpp @@ -1,37 +1,41 @@ +/* +------------------------------------+ + * | Inspire Internet Relay Chat Daemon | + * +------------------------------------+ + * + * InspIRCd: (C) 2002-2008 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/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 InspIRCd* ServerInstance; -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, '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, 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 { @@ -45,22 +49,49 @@ ModeAction ModeChannelBan::OnModeChange(userrec* source, userrec* dest, chanrec* return MODEACTION_ALLOW; } -void ModeChannelBan::DisplayList(userrec* user, chanrec* channel) +void ModeChannelBan::RemoveMode(Channel* channel) { - /* Display the channel banlist */ + BanList copy; + char moderemove[MAXBUF]; + for (BanList::iterator i = channel->bans.begin(); i != channel->bans.end(); i++) { - user->WriteServ("367 %s %s %s %s %d",user->nick, channel->name, i->data, i->set_by, i->set_time); + 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, ServerInstance->FakeClient); + } +} + +void ModeChannelBan::RemoveMode(User*) +{ +} + +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 %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; } -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, channel->name); +} + +std::string& ModeChannelBan::AddBan(User *user, std::string &dest, Channel *chan, int, bool servermode) { if ((!user) || (!chan)) { - log(DEFAULT,"*** BUG *** AddBan was given an invalid parameter"); + ServerInstance->Logs->Log("MODE",DEFAULT,"*** BUG *** AddBan was given an invalid parameter"); dest = ""; return dest; } @@ -74,7 +105,7 @@ std::string& ModeChannelBan::AddBan(userrec *user,std::string &dest,chanrec *cha 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; } @@ -89,7 +120,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, dest.c_str())) { /* dont allow a user to set the same ban twice */ dest = ""; @@ -97,21 +128,14 @@ 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,ServerInstance->Config->ServerName,NICKMAX-1); - } + b.set_time = ServerInstance->Time(); + strlcpy(b.data, dest.c_str(), MAXBUF); + strlcpy(b.set_by, servermode ? ServerInstance->Config->ServerName : user->nick, 63); 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++) { @@ -123,11 +147,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)) { - log(DEFAULT,"*** BUG *** TakeBan was given an invalid parameter"); + ServerInstance->Logs->Log("MODE",DEFAULT,"*** BUG *** TakeBan was given an invalid parameter"); dest = ""; return dest; }