diff options
| author | Adam <Adam@anope.org> | 2013-01-02 13:59:33 -0500 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2013-01-02 13:59:33 -0500 |
| commit | 827469600e8cf98fea7aec09ceaa77a097300b72 (patch) | |
| tree | 6c957be4e9f2a0c8c6eddf2537b8553f1f6ffdbb /modules/protocol/hybrid.cpp | |
| parent | bf718e869892bf418051d0140d7628c69d4ee3c9 (diff) | |
Move nickserv validate stuff to an event in nickserv.cpp
Diffstat (limited to 'modules/protocol/hybrid.cpp')
| -rw-r--r-- | modules/protocol/hybrid.cpp | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/modules/protocol/hybrid.cpp b/modules/protocol/hybrid.cpp index 55c126a90..bc4fd55f4 100644 --- a/modules/protocol/hybrid.cpp +++ b/modules/protocol/hybrid.cpp @@ -502,22 +502,11 @@ struct IRCDMessageUID : IRCDMessage params[9], params[2].is_pos_number_only() ? convertTo<time_t>(params[2]) : 0, params[3], params[7]); - if (user && NickServService) + if (NickServService && params[8] != "0") { - const NickAlias *na = NULL; - - if (params[8] != "0") - na = NickAlias::Find(params[8]); - - if (na) - { - user->Login(na->nc); - - if (!Config->NoNicknameOwnership && na->nc->HasFlag(NI_UNCONFIRMED) == false) - user->SetMode(NickServ, UMODE_REGISTERED); - } - else - NickServService->Validate(user); + NickAlias *na = NickAlias::Find(params[8]); + if (na != NULL) + NickServService->Login(user, na); } } }; |