* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * 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.
inline std::string stringtime()
{
std::ostringstream TIME;
- TIME << time(NULL);
+ TIME << ServerInstance->Time();
return TIME.str();
}
/** Items stored in the channel's list
*/
-typedef std::vector<ListItem> modelist;
+typedef std::list<ListItem> modelist;
/** Max items per channel by name
*/
-typedef std::vector<ListLimit> limitlist;
-
-/** A request used to check if a user is on a channel's list or not
- */
-class ListModeRequest : public Request
-{
- public:
- User* user;
- std::string literal;
- const char extban;
- Channel* chan;
-
- /** Check if a user is on a channel's list.
- * The Event::Send() event returns the ban string if the user is on the channel's list,
- * or NULL if the user is not on the list.
- * @param sender Sending module
- * @param target Target module
- * @param u User to check against
- * @param c Channel to check against
- */
- ListModeRequest(Module* sender, Module* target, User* u, Channel* c) : Request(sender, target, "LM_CHECKLIST"), user(u), literal(""), extban(0), chan(c)
- {
- }
-
- /** Check if a literal string is on a channel's list, optionally using an extban char.
- * The Event::Send() event returns the ban string if the user is on the channel's list,
- * or NULL if the user is not on the list.
- * @param sender Sending module
- * @param target Target module
- * @param literalstr String to check against, e.g. "Bob!Bobbertson@weeblshouse"
- * @param extbanchar Extended ban character to use for the match, or a null char if not using extban
- */
- ListModeRequest(Module* sender, Module* target, std::string literalstr, char extbanchar, Channel* channel) : Request(sender, target, "LM_CHECKLIST_EX"), user(NULL), literal(literalstr), extban(extbanchar), chan(channel)
- {
- }
-
- /** Check if a literal string is on a channel's list, optionally using an extban char.
- * The Event::Send() event returns the ban string if the user is on the channel's list,
- * or NULL if the user is not on the list.
- * @param sender Sending module
- * @param target Target module
- * @param User to check against, e.g. "Bob!Bobbertson@weeblshouse"
- * @param extbanchar Extended ban character to use for the match, or a null char if not using extban
- */
- ListModeRequest(Module* sender, Module* target, User* u, char extbanchar, Channel* channel) : Request(sender, target, "LM_CHECKLIST_EX"), user(u), literal(""), extban(extbanchar), chan(channel)
- {
- }
-
- /** Destructor
- */
- ~ListModeRequest()
- {
- }
-};
+typedef std::list<ListLimit> limitlist;
/** The base class for list modes, should be inherited.
*/
class ListModeBase : public ModeHandler
{
protected:
- /** Storage key
- */
- std::string infokey;
/** Numeric to use when outputting the list
*/
unsigned int listnumeric;
bool tidy;
/** Config tag to check for max items per channel
*/
- std::string configtag;
+ std::string configtag;
/** Limits on a per-channel basis read from the tag
* specified in ListModeBase::configtag
*/
limitlist chanlimits;
-
+
public:
+ /** Storage key
+ */
+ SimpleExtItem<modelist> extItem;
+
/** Constructor.
* @param Instance The creator of this class
* @param modechar Mode character
* @param autotidy Automatically tidy list entries on add
* @param ctag Configuration tag to get limits from
*/
- ListModeBase(InspIRCd* Instance, char modechar, const std::string &eolstr, unsigned int lnum, unsigned int eolnum, bool autotidy, const std::string &ctag = "banlist")
- : ModeHandler(Instance, modechar, 1, 1, true, MODETYPE_CHANNEL, false), listnumeric(lnum), endoflistnumeric(eolnum), endofliststring(eolstr), tidy(autotidy), configtag(ctag)
+ ListModeBase(Module* Creator, const std::string& Name, char modechar, const std::string &eolstr, unsigned int lnum, unsigned int eolnum, bool autotidy, const std::string &ctag = "banlist")
+ : ModeHandler(Creator, Name, modechar, PARAM_ALWAYS, MODETYPE_CHANNEL),
+ listnumeric(lnum), endoflistnumeric(eolnum), endofliststring(eolstr), tidy(autotidy),
+ configtag(ctag), extItem("listbase_mode_" + name + "_list", Creator)
{
+ list = true;
this->DoRehash();
- infokey = "listbase_mode_" + std::string(1, mode) + "_list";
+ Extensible::Register(&extItem);
}
- /** See mode.h
+ /** See mode.h
*/
std::pair<bool,std::string> ModeSet(User*, User*, Channel* channel, const std::string ¶meter)
{
- modelist* el;
- channel->GetExt(infokey, el);
+ modelist* el = extItem.get(channel);
if (el)
{
for (modelist::iterator it = el->begin(); it != el->end(); it++)
*/
virtual void DisplayList(User* user, Channel* channel)
{
- modelist* el;
- channel->GetExt(infokey, el);
+ modelist* el = extItem.get(channel);
if (el)
{
for (modelist::reverse_iterator it = el->rbegin(); it != el->rend(); ++it)
{
- user->WriteNumeric(listnumeric, "%s %s %s %s %s", user->nick.c_str(), channel->name.c_str(), it->mask.c_str(), (it->nick.length() ? it->nick.c_str() : ServerInstance->Config->ServerName), it->time.c_str());
+ user->WriteNumeric(listnumeric, "%s %s %s %s %s", user->nick.c_str(), channel->name.c_str(), it->mask.c_str(), (it->nick.length() ? it->nick.c_str() : ServerInstance->Config->ServerName.c_str()), it->time.c_str());
}
}
user->WriteNumeric(endoflistnumeric, "%s %s :%s", user->nick.c_str(), channel->name.c_str(), endofliststring.c_str());
*/
virtual void RemoveMode(Channel* channel, irc::modestacker* stack)
{
- modelist* el;
- channel->GetExt(infokey, el);
+ modelist* el = extItem.get(channel);
if (el)
{
- irc::modestacker modestack(ServerInstance, false);
- std::deque<std::string> stackresult;
- std::vector<std::string> mode_junk;
- mode_junk.push_back(channel->name);
+ irc::modestacker modestack(false);
for (modelist::iterator it = el->begin(); it != el->end(); it++)
{
if (stack)
return;
+ std::vector<std::string> stackresult;
+ stackresult.push_back(channel->name);
while (modestack.GetStackedLine(stackresult))
{
- for (size_t j = 0; j < stackresult.size(); j++)
- {
- mode_junk.push_back(stackresult[j]);
- }
-
- ServerInstance->SendMode(mode_junk, ServerInstance->FakeClient);
+ ServerInstance->SendMode(stackresult, ServerInstance->FakeClient);
+ stackresult.clear();
+ stackresult.push_back(channel->name);
}
}
}
*/
virtual void DoRehash()
{
- ConfigReader Conf(ServerInstance);
+ ConfigReader Conf;
chanlimits.clear();
*/
virtual void DoImplements(Module* m)
{
- Implementation eventlist[] = { I_OnChannelDelete, I_OnSyncChannel, I_OnCleanup, I_OnRehash, I_OnRequest };
- ServerInstance->Modules->Attach(eventlist, m, 5);
+ Implementation eventlist[] = { I_OnChannelDelete, I_OnSyncChannel, I_OnRehash };
+ ServerInstance->Modules->Attach(eventlist, m, 3);
}
/** Handle the list mode.
* See mode.h
*/
- virtual ModeAction OnModeChange(User* source, User*, Channel* channel, std::string ¶meter, bool adding, bool servermode)
+ virtual ModeAction OnModeChange(User* source, User*, Channel* channel, std::string ¶meter, bool adding)
{
// Try and grab the list
- modelist* el;
- channel->GetExt(infokey, el);
+ modelist* el = extItem.get(channel);
if (adding)
{
{
// Make one
el = new modelist;
- channel->Extend(infokey, el);
+ extItem.set(channel, el);
}
// Clean the mask up
{
/* Give a subclass a chance to error about this */
TellAlreadyOnList(source, channel, parameter);
-
+
// it does, deny the change
return MODEACTION_DENY;
}
// And now add the mask onto the list...
ListItem e;
e.mask = parameter;
- e.nick = servermode ? ServerInstance->Config->ServerName : source->nick;
+ e.nick = source->nick;
e.time = stringtime();
el->push_back(e);
{
source->WriteNumeric(478, "%s %s %s :Channel ban/ignore list is full", source->nick.c_str(), channel->name.c_str(), parameter.c_str());
}
-
+
parameter = "";
- return MODEACTION_DENY;
+ return MODEACTION_DENY;
}
else
{
el->erase(it);
if (el->size() == 0)
{
- channel->Shrink(infokey);
- delete el;
+ extItem.unset(channel);
}
return MODEACTION_ALLOW;
}
return MODEACTION_DENY;
}
- /** Get Extensible key for this mode
- */
- virtual std::string& GetInfoKey()
- {
- return infokey;
- }
-
- /** Handle channel deletion.
- * See modules.h.
- * @param chan Channel being deleted
- */
- virtual void DoChannelDelete(Channel* chan)
- {
- modelist* mlist;
- chan->GetExt(infokey, mlist);
-
- if (mlist)
- {
- chan->Shrink(infokey);
- delete mlist;
- }
- }
-
/** Syncronize channel item list with another server.
* See modules.h
* @param chan Channel to syncronize
*/
virtual void DoSyncChannel(Channel* chan, Module* proto, void* opaque)
{
- modelist* mlist;
- chan->GetExt(infokey, mlist);
- irc::modestacker modestack(ServerInstance, true);
- std::deque<std::string> stackresult;
+ modelist* mlist = extItem.get(chan);
+ irc::modestacker modestack(true);
+ std::vector<std::string> stackresult;
+ std::vector<TranslateType> types;
+ types.push_back(TR_TEXT);
if (mlist)
{
for (modelist::iterator it = mlist->begin(); it != mlist->end(); it++)
}
while (modestack.GetStackedLine(stackresult))
{
- irc::stringjoiner mode_join(" ", stackresult, 0, stackresult.size() - 1);
- std::string line = mode_join.GetJoined();
- proto->ProtoSendMode(opaque, TYPE_CHANNEL, chan, line);
+ types.assign(stackresult.size(), this->GetTranslateType());
+ proto->ProtoSendMode(opaque, TYPE_CHANNEL, chan, stackresult, types);
+ stackresult.clear();
}
}
virtual void DoCleanup(int, void*)
{
}
-
+
/** Validate parameters.
* Overridden by implementing module.
* @param source Source user adding the parameter
{
return true;
}
-
+
/** Tell the user the list is too long.
* Overridden by implementing module.
* @param source Source user adding the parameter
{
return false;
}
-
+
/** Tell the user an item is already on the list.
* Overridden by implementing module.
* @param source Source user adding the parameter
virtual void TellAlreadyOnList(User*, Channel*, std::string&)
{
}
-
+
/** Tell the user that the parameter is not in the list.
* Overridden by implementing module.
* @param source Source user removing the parameter
virtual void TellNotSet(User*, Channel*, std::string&)
{
}
-
- virtual const char* DoOnRequest(Request* request)
- {
- ListModeRequest* LM = (ListModeRequest*)request;
- if (strcmp("LM_CHECKLIST", request->GetId()) == 0)
- {
- modelist* mlist;
- LM->chan->GetExt(GetInfoKey(), mlist);
- if (mlist)
- {
- std::string mask = LM->user->nick + "!" + LM->user->ident + "@" + LM->user->GetIPString();
- for (modelist::iterator it = mlist->begin(); it != mlist->end(); ++it)
- {
- if (InspIRCd::Match(LM->user->GetFullRealHost(), it->mask) || InspIRCd::Match(LM->user->GetFullHost(), it->mask) || (InspIRCd::MatchCIDR(mask, it->mask)))
- return it->mask.c_str();
- }
- return NULL;
- }
- }
- else if (strcmp("LM_CHECKLIST_EX", request->GetId()) == 0)
- {
- modelist* mlist;
- LM->chan->GetExt(GetInfoKey(), mlist);
- if (mlist)
- {
- if (LM->user)
- LM->literal = LM->user->nick + "!" + LM->user->ident + "@" + LM->user->GetIPString();
-
- for (modelist::iterator it = mlist->begin(); it != mlist->end(); it++)
- {
- if (LM->extban && it->mask.length() > 1 && it->mask[0] == LM->extban && it->mask[1] == ':')
- {
- static std::string ext = it->mask.substr(2);
- if (LM->user)
- {
- if (InspIRCd::Match(LM->user->GetFullRealHost(), ext) || InspIRCd::Match(LM->user->GetFullHost(), ext) || (InspIRCd::MatchCIDR(LM->literal, ext)))
- return it->mask.c_str();
- }
- else if (InspIRCd::Match(LM->literal, ext))
- return it->mask.c_str();
- }
- else
- {
- if (LM->user)
- {
- if (InspIRCd::Match(LM->user->GetFullRealHost(), it->mask) || InspIRCd::Match(LM->user->GetFullHost(), it->mask) || (InspIRCd::MatchCIDR(LM->literal, it->mask)))
- return it->mask.c_str();
- }
- else if (InspIRCd::Match(LM->literal, it->mask))
- return it->mask.c_str();
- }
- }
- }
- }
- return NULL;
- }
-
};
#endif
-
projects / user / henk / code / inspircd.git / blobdiff