X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=include%2Fu_listmode.h;h=6c6e2ca28fbc63374a5e9c096e824eb390983c48;hb=3f971b447fae258a92f2cc6645497cce93f1c04e;hp=9d78fe64b568d792a89dd3342aea9f53a37e4611;hpb=b57c7f4e466f72fdd2ac3deca42caa1ea7748338;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/include/u_listmode.h b/include/u_listmode.h index 9d78fe64b..6c6e2ca28 100644 --- a/include/u_listmode.h +++ b/include/u_listmode.h @@ -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 @@ -14,15 +14,7 @@ #ifndef INSPIRCD_LISTMODE_PROVIDER #define INSPIRCD_LISTMODE_PROVIDER -#include -#include -#include -#include -#include "users.h" -#include "channels.h" -#include "modules.h" #include "wildcard.h" -#include "inspircd.h" /** Get the time as a string */ @@ -132,7 +124,7 @@ class ListModeBase : public ModeHandler /** See mode.h */ - std::pair ModeSet(User* source, User* dest, Channel* channel, const std::string ¶meter) + std::pair ModeSet(User*, User*, Channel* channel, const std::string ¶meter) { modelist* el; channel->GetExt(infokey, el); @@ -176,7 +168,7 @@ class ListModeBase : public ModeHandler * See mode.h * @param channel The channel to remove all instances of the mode from */ - virtual void RemoveMode(Channel* channel) + virtual void RemoveMode(Channel* channel, irc::modestacker* stack) { modelist* el; channel->GetExt(infokey, el); @@ -189,9 +181,15 @@ class ListModeBase : public ModeHandler for (modelist::iterator it = el->begin(); it != el->end(); it++) { - modestack.Push(this->GetModeChar(), assign(it->mask)); + if (stack) + stack->Push(this->GetModeChar(), assign(it->mask)); + else + modestack.Push(this->GetModeChar(), assign(it->mask)); } + if (stack) + return; + while (modestack.GetStackedLine(stackresult)) { for (size_t j = 0; j < stackresult.size(); j++) @@ -206,7 +204,7 @@ class ListModeBase : public ModeHandler /** See mode.h */ - virtual void RemoveMode(User* user) + virtual void RemoveMode(User*, irc::modestacker* stack) { /* Listmodes dont get set on users */ } @@ -240,15 +238,16 @@ class ListModeBase : public ModeHandler /** Populate the Implements list with the correct events for a List Mode */ - virtual void DoImplements(char* List) + virtual void DoImplements(Module* m) { - List[I_OnChannelDelete] = List[I_OnSyncChannel] = List[I_OnCleanup] = List[I_OnRehash] = 1; + Implementation eventlist[] = { I_OnChannelDelete, I_OnSyncChannel, I_OnCleanup, I_OnRehash }; + ServerInstance->Modules->Attach(eventlist, m, 4); } /** Handle the list mode. * See mode.h */ - virtual ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) + virtual ModeAction OnModeChange(User* source, User*, Channel* channel, std::string ¶meter, bool adding, bool servermode) { // Try and grab the list modelist* el; @@ -306,7 +305,7 @@ class ListModeBase : public ModeHandler // And now add the mask onto the list... ListItem e; e.mask = assign(parameter); - e.nick = source->nick; + e.nick = servermode ? ServerInstance->Config->ServerName : source->nick; e.time = stringtime(); el->push_back(e); @@ -324,7 +323,7 @@ class ListModeBase : public ModeHandler /* List is full, give subclass a chance to send a custom message */ if (!TellListTooLong(source, channel, parameter)) { - source->WriteServ("478 %s %s %s :Channel ban/ignore list is full", source->nick, channel->name, parameter.c_str()); + source->WriteNumeric(478, "%s %s %s :Channel ban/ignore list is full", source->nick, channel->name, parameter.c_str()); } parameter = ""; @@ -377,13 +376,13 @@ class ListModeBase : public ModeHandler */ virtual void DoChannelDelete(Channel* chan) { - modelist* list; - chan->GetExt(infokey, list); + modelist* mlist; + chan->GetExt(infokey, mlist); - if (list) + if (mlist) { chan->Shrink(infokey); - delete list; + delete mlist; } } @@ -395,13 +394,13 @@ class ListModeBase : public ModeHandler */ virtual void DoSyncChannel(Channel* chan, Module* proto, void* opaque) { - modelist* list; - chan->GetExt(infokey, list); + modelist* mlist; + chan->GetExt(infokey, mlist); irc::modestacker modestack(true); std::deque stackresult; - if (list) + if (mlist) { - for (modelist::iterator it = list->begin(); it != list->end(); it++) + for (modelist::iterator it = mlist->begin(); it != mlist->end(); it++) { modestack.Push(std::string(1, mode)[0], assign(it->mask)); } @@ -418,7 +417,7 @@ class ListModeBase : public ModeHandler * @param target_type Type of target to clean * @param item Item to clean */ - virtual void DoCleanup(int target_type, void* item) + virtual void DoCleanup(int, void*) { } @@ -429,7 +428,7 @@ class ListModeBase : public ModeHandler * @param parameter The actual parameter being added * @return true if the parameter is valid */ - virtual bool ValidateParam(User* source, Channel* channel, std::string ¶meter) + virtual bool ValidateParam(User*, Channel*, std::string&) { return true; } @@ -441,7 +440,7 @@ class ListModeBase : public ModeHandler * @param parameter The actual parameter being added * @return Ignored */ - virtual bool TellListTooLong(User* source, Channel* channel, std::string ¶meter) + virtual bool TellListTooLong(User*, Channel*, std::string&) { return false; } @@ -452,7 +451,7 @@ class ListModeBase : public ModeHandler * @param channel Channel the parameter is being added to * @param parameter The actual parameter being added */ - virtual void TellAlreadyOnList(User* source, Channel* channel, std::string ¶meter) + virtual void TellAlreadyOnList(User*, Channel*, std::string&) { } @@ -462,7 +461,7 @@ class ListModeBase : public ModeHandler * @param channel Channel the parameter is being removed from * @param parameter The actual parameter being removed */ - virtual void TellNotSet(User* source, Channel* channel, std::string ¶meter) + virtual void TellNotSet(User*, Channel*, std::string&) { } };