diff options
Diffstat (limited to 'modules')
-rw-r--r-- | modules/core/ns_group.cpp | 3 | ||||
-rw-r--r-- | modules/core/ns_register.cpp | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/modules/core/ns_group.cpp b/modules/core/ns_group.cpp index ef88ab656..5a568ca7f 100644 --- a/modules/core/ns_group.cpp +++ b/modules/core/ns_group.cpp @@ -117,7 +117,8 @@ class CommandNSGroup : public Command u->Login(na->nc); FOREACH_MOD(I_OnNickGroup, OnNickGroup(u, target)); - ircdproto->SendAccountLogin(u, u->Account()); + if (target->nc->HasFlag(NI_UNCONFIRMED) == false) + ircdproto->SendAccountLogin(u, u->Account()); ircdproto->SetAutoIdentificationToken(u); Log(LOG_COMMAND, u, this) << "makes " << u->nick << " join group of " << target->nick << " (" << target->nc->display << ") (email: " << (!target->nc->email.empty() ? target->nc->email : "none") << ")"; diff --git a/modules/core/ns_register.cpp b/modules/core/ns_register.cpp index e6b56143b..15d5c2331 100644 --- a/modules/core/ns_register.cpp +++ b/modules/core/ns_register.cpp @@ -190,8 +190,8 @@ class CommandNSRegister : public Command source.Reply(_("If you do not confirm your email address within %s your account will expire."), duration(Config->NSUnconfirmedExpire).c_str()); } } - - ircdproto->SendAccountLogin(u, u->Account()); + else + ircdproto->SendAccountLogin(u, u->Account()); ircdproto->SetAutoIdentificationToken(u); u->lastnickreg = Anope::CurTime; |