pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-07-09 00:43:13 +02:00
Code Activity

Merge branch '2.0' into 2.1.

Browse Source
This commit is contained in:
Sadie Powell
2023-11-16 19:33:51 +00:00
parent b28180d680 ba163027bd
commit 46209895e3
5 changed files with 52 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/commands/ns_register.cpp
+7 -5
View File
@@ -25,13 +25,15 @@ class CommandNSConfirm : public Command
void Execute(CommandSource &source, const std::vector<Anope::string> &params) override
{
const Anope::string &passcode = params[0];
Anope::string *code = source.nc ? source.nc->GetExt<Anope::string>("passcode") : NULL;
bool confirming_other = !code || *code != params[0];
if (source.nc && (!source.nc->HasExt("UNCONFIRMED") || source.IsOper()) && source.HasPriv("nickserv/confirm"))
if (source.nc && (!source.nc->HasExt("UNCONFIRMED") || (source.IsOper() && confirming_other)) && source.HasPriv("nickserv/confirm"))
{
NickAlias *na = NickAlias::Find(passcode);
const Anope::string &nick = params[0];
NickAlias *na = NickAlias::Find(nick);
if (na == NULL)
source.Reply(NICK_X_NOT_REGISTERED, passcode.c_str());
source.Reply(NICK_X_NOT_REGISTERED, nick.c_str());
else if (na->nc->HasExt("UNCONFIRMED") == false)
source.Reply(_("Nick \002%s\002 is already confirmed."), na->nick.c_str());
else
@@ -58,7 +60,7 @@ class CommandNSConfirm : public Command
}
else if (source.nc)
{
Anope::string *code = source.nc->GetExt<Anope::string>("passcode");
const Anope::string &passcode = params[0];
if (code != NULL && *code == passcode)
{
NickCore *nc = source.nc;