1
0
mirror of https://github.com/anope/anope.git synced 2026-07-09 11:03:11 +02:00

Cleanup ok if modules with pending identify requests are unloaded

This commit is contained in:
Adam
2012-10-09 05:22:02 -04:00
parent 1dacc648a0
commit 8f5d786f0e
11 changed files with 32 additions and 20 deletions
+3 -3
View File
@@ -19,7 +19,7 @@ class NSGhostRequest : public IdentifyRequest
Command *cmd;
public:
NSGhostRequest(CommandSource &src, Command *c, const Anope::string &user, const Anope::string &pass) : IdentifyRequest(user, pass), source(src), cmd(c) { }
NSGhostRequest(Module *o, CommandSource &src, Command *c, const Anope::string &user, const Anope::string &pass) : IdentifyRequest(o, user, pass), source(src), cmd(c) { }
void OnSuccess() anope_override
{
@@ -90,13 +90,13 @@ class CommandNSGhost : public Command
if (ok == false && !pass.empty())
{
NSGhostRequest *req = new NSGhostRequest(source, this, na->nc->display, pass);
NSGhostRequest *req = new NSGhostRequest(owner, source, this, na->nc->display, pass);
FOREACH_MOD(I_OnCheckAuthentication, OnCheckAuthentication(source.GetUser(), req));
req->Dispatch();
}
else
{
NSGhostRequest req(source, this, na->nc->display, pass);
NSGhostRequest req(owner, source, this, na->nc->display, pass);
if (ok)
req.OnSuccess();
+3 -3
View File
@@ -21,7 +21,7 @@ class NSGroupRequest : public IdentifyRequest
dynamic_reference<NickAlias> target;
public:
NSGroupRequest(CommandSource &src, Command *c, const Anope::string &n, NickAlias *targ, const Anope::string &pass) : IdentifyRequest(targ->nc->display, pass), source(src), cmd(c), nick(n), target(targ) { }
NSGroupRequest(Module *o, CommandSource &src, Command *c, const Anope::string &n, NickAlias *targ, const Anope::string &pass) : IdentifyRequest(o, targ->nc->display, pass), source(src), cmd(c), nick(n), target(targ) { }
void OnSuccess() anope_override
{
@@ -146,13 +146,13 @@ class CommandNSGroup : public Command
if (ok == false && !pass.empty())
{
NSGroupRequest *req = new NSGroupRequest(source, this, u->nick, target, pass);
NSGroupRequest *req = new NSGroupRequest(owner, source, this, u->nick, target, pass);
FOREACH_MOD(I_OnCheckAuthentication, OnCheckAuthentication(source.GetUser(), req));
req->Dispatch();
}
else
{
NSGroupRequest req(source, this, u->nick, target, pass);
NSGroupRequest req(owner, source, this, u->nick, target, pass);
if (ok)
req.OnSuccess();
+2 -2
View File
@@ -19,7 +19,7 @@ class NSIdentifyRequest : public IdentifyRequest
Command *cmd;
public:
NSIdentifyRequest(CommandSource &s, Command *c, const Anope::string &acc, const Anope::string &pass) : IdentifyRequest(acc, pass), source(s), cmd(c) { }
NSIdentifyRequest(Module *o, CommandSource &s, Command *c, const Anope::string &acc, const Anope::string &pass) : IdentifyRequest(o, acc, pass), source(s), cmd(c) { }
void OnSuccess() anope_override
{
@@ -81,7 +81,7 @@ class CommandNSIdentify : public Command
source.Reply(_("You are already identified."));
else
{
NSIdentifyRequest *req = new NSIdentifyRequest(source, this, na ? na->nc->display : nick, pass);
NSIdentifyRequest *req = new NSIdentifyRequest(owner, source, this, na ? na->nc->display : nick, pass);
FOREACH_MOD(I_OnCheckAuthentication, OnCheckAuthentication(source.GetUser(), req));
req->Dispatch();
}
+3 -3
View File
@@ -21,7 +21,7 @@ class NSRecoverRequest : public IdentifyRequest
dynamic_reference<NickAlias> na;
public:
NSRecoverRequest(CommandSource &src, Command *c, NickAlias *n, const Anope::string &pass) : IdentifyRequest(n->nc->display, pass), source(src), cmd(c), na(n) { }
NSRecoverRequest(Module *m, CommandSource &src, Command *c, NickAlias *n, const Anope::string &pass) : IdentifyRequest(m, n->nc->display, pass), source(src), cmd(c), na(n) { }
void OnSuccess() anope_override
{
@@ -101,13 +101,13 @@ class CommandNSRecover : public Command
if (ok == false && !pass.empty())
{
NSRecoverRequest *req = new NSRecoverRequest(source, this, na, pass);
NSRecoverRequest *req = new NSRecoverRequest(owner, source, this, na, pass);
FOREACH_MOD(I_OnCheckAuthentication, OnCheckAuthentication(source.GetUser(), req));
req->Dispatch();
}
else
{
NSRecoverRequest req(source, this, na, pass);
NSRecoverRequest req(owner, source, this, na, pass);
if (ok)
req.OnSuccess();
+3 -3
View File
@@ -20,7 +20,7 @@ class NSReleaseRequest : public IdentifyRequest
dynamic_reference<NickAlias> na;
public:
NSReleaseRequest(CommandSource &src, Command *c, NickAlias *n, const Anope::string &pass) : IdentifyRequest(n->nc->display, pass), source(src), cmd(c), na(n) { }
NSReleaseRequest(Module *m, CommandSource &src, Command *c, NickAlias *n, const Anope::string &pass) : IdentifyRequest(m, n->nc->display, pass), source(src), cmd(c), na(n) { }
void OnSuccess() anope_override
{
@@ -81,13 +81,13 @@ class CommandNSRelease : public Command
if (ok == false && !pass.empty())
{
NSReleaseRequest *req = new NSReleaseRequest(source, this, na, pass);
NSReleaseRequest *req = new NSReleaseRequest(owner, source, this, na, pass);
FOREACH_MOD(I_OnCheckAuthentication, OnCheckAuthentication(source.GetUser(), req));
req->Dispatch();
}
else
{
NSReleaseRequest req(source, this, na, pass);
NSReleaseRequest req(owner, source, this, na, pass);
if (ok)
req.OnSuccess();