From 8f36f65f39c6ea843c388af398ed0bbfe84d1207 Mon Sep 17 00:00:00 2001 From: Adam Date: Fri, 9 Nov 2012 19:20:17 -0500 Subject: Made access del and xop del behave like access add/xop add by using a users mask if given an unregistered nick --- modules/commands/cs_xop.cpp | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'modules/commands/cs_xop.cpp') diff --git a/modules/commands/cs_xop.cpp b/modules/commands/cs_xop.cpp index aa04b8d28..1fc3cbdf0 100644 --- a/modules/commands/cs_xop.cpp +++ b/modules/commands/cs_xop.cpp @@ -291,7 +291,7 @@ class XOPBase : public Command void DoDel(CommandSource &source, ChannelInfo *ci, const std::vector ¶ms, XOPType level) { NickCore *nc = source.nc; - const Anope::string &mask = params.size() > 2 ? params[2] : ""; + Anope::string mask = params.size() > 2 ? params[2] : ""; if (mask.empty()) { @@ -319,6 +319,18 @@ class XOPBase : public Command const ChanAccess *highest = access.Highest(); bool override = false; + if (mask.find_first_of("!*@") == Anope::string::npos && !findnick(mask)) + { + User *targ = finduser(mask); + if (targ != NULL) + mask = "*!*@" + targ->GetDisplayedHost(); + else + { + source.Reply(NICK_X_NOT_REGISTERED, mask.c_str()); + return; + } + } + if ((!mask.equals_ci(nc->display) && !access.HasPriv("ACCESS_CHANGE") && !access.Founder) || ((!highest || tmp_access >= *highest) && !access.Founder)) { if (source.HasPriv("chanserv/access/modify")) -- cgit