* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ * InspIRCd: (C) 2002-2009 InspIRCd Development Team
* See: http://www.inspircd.org/wiki/index.php/Credits
*
* This program is free but copyrighted software; see
/** Get the time as a string
*/
-inline std::string stringtime()
+inline std::string stringtime(InspIRCd* Instance)
{
std::ostringstream TIME;
- TIME << time(NULL);
+ TIME << Instance->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;
+typedef std::list<ListLimit> limitlist;
/** A request used to check if a user is on a channel's list or not
*/
{
public:
User* user;
- const std::string literal;
+ std::string literal;
const char extban;
Channel* chan;
* @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) : Request(sender, target, "LM_CHECKLIST_EX"), literal(literalstr), extban(extbanchar)
+ 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)
{
}
{
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.c_str(), 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), it->time.c_str());
}
}
user->WriteNumeric(endoflistnumeric, "%s %s :%s", user->nick.c_str(), channel->name.c_str(), endofliststring.c_str());
ListItem e;
e.mask = parameter;
e.nick = servermode ? ServerInstance->Config->ServerName : source->nick;
- e.time = stringtime();
+ e.time = stringtime(ServerInstance);
el->push_back(e);
return MODEACTION_ALLOW;
LM->chan->GetExt(GetInfoKey(), mlist);
if (mlist)
{
- std::string mask = std::string(LM->user->nick) + "!" + LM->user->ident + "@" + LM->user->GetIPString();
+ 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)))
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] == ':')
{
- if (InspIRCd::Match(LM->literal.substr(2), it->mask))
+ 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 (InspIRCd::Match(LM->literal, it->mask))
+ 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();
}
}