pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-06-29 19:16:38 +02:00
Code Activity

Fixed loading akill reasons

Browse Source
This commit is contained in:
Adam
2012-01-08 19:42:48 -05:00
parent f8245574dc
commit 815e140ecf
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/commands/os_akill.cpp
+4 -4
View File
@@ -98,10 +98,11 @@ class CommandOSAKill : public Command
reason += " " + params[3];
if (!mask.empty() && !reason.empty())
{
User *targ = NULL;
std::pair<int, XLine *> canAdd = akills->CanAdd(mask, expires);
if (mask.find('!') != Anope::string::npos)
source.Reply(_("\002Reminder\002: AKILL masks cannot contain nicknames; make sure you have \002not\002 included a nick portion in your mask."));
else if (mask.find('@') == Anope::string::npos)
else if (mask.find('@') == Anope::string::npos && !(targ = finduser(mask)))
source.Reply(BAD_USERHOST_MASK);
else if (mask.find_first_not_of("~@.*?") == Anope::string::npos)
source.Reply(USERHOST_MASK_TOO_WIDE, mask.c_str());
@@ -113,9 +114,8 @@ class CommandOSAKill : public Command
source.Reply(_("\002%s\002 is already covered by %s."), mask.c_str(), canAdd.second->Mask.c_str());
else
{
User *user = finduser(mask);
if (user)
mask = "*@" + user->host;
if (targ)
mask = "*@" + targ->host;
unsigned int affected = 0;
for (Anope::insensitive_map<User *>::iterator it = UserListByNick.begin(); it != UserListByNick.end(); ++it)
if (Anope::Match(it->second->GetIdent() + "@" + it->second->host, mask))
src/operserv.cpp
+1 -1
View File
@@ -98,7 +98,7 @@ void XLine::unserialize(serialized_data &data)
time_t expires;
data["expires"] >> expires;
XLine *xl = new XLine(data["mask"].astr(), data["by"].astr(), expires, data["expires"].astr(), data["uid"].astr());
XLine *xl = new XLine(data["mask"].astr(), data["by"].astr(), expires, data["reason"].astr(), data["uid"].astr());
data["created"] >> xl->Created;
xl->manager = xlm;