From 5ac1e9175d90fad5feaf235dfe225ddffc47f257 Mon Sep 17 00:00:00 2001 From: Adam Date: Wed, 19 Jun 2013 18:59:26 -0400 Subject: Set vhosts when users id to an account (and not a nick), add account arg to user ctor to ease handling users who connect already identified --- modules/protocol/plexus.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'modules/protocol/plexus.cpp') diff --git a/modules/protocol/plexus.cpp b/modules/protocol/plexus.cpp index e3efdc6e6..cacaa59d0 100644 --- a/modules/protocol/plexus.cpp +++ b/modules/protocol/plexus.cpp @@ -270,17 +270,17 @@ struct IRCDMessageUID : IRCDMessage ts = Anope::CurTime; } - User *user = new User(params[0], params[4], params[9], params[5], ip, source.GetServer(), params[10], ts, params[3], params[7]); + NickAlias *na = NULL; try { - if (params[8].is_pos_number_only() && convertTo(params[8]) == user->timestamp) - { - NickAlias *na = NickAlias::Find(user->nick); - if (na) - user->Login(na->nc); - } + if (params[8].is_pos_number_only() && convertTo(params[8]) == ts) + na = NickAlias::Find(params[0]); } catch (const ConvertException &) { } + if (params[8] != "0" && !na) + na = NickAlias::Find(params[8]); + + new User(params[0], params[4], params[9], params[5], ip, source.GetServer(), params[10], ts, params[3], params[7], na ? *na->nc : NULL); } }; -- cgit