Remove InspIRCd* parameters and fields

[user/henk/code/inspircd.git] / src / commands / cmd_nick.cpp

diff --git a/src/commands/cmd_nick.cpp b/src/commands/cmd_nick.cpp
index a447f7d7090aac2b9b762f12b9bd8ab6a0ca2c2b..bdaff8723d62364ba66323762d44a155db613022 100644 (file)
--- a/src/commands/cmd_nick.cpp
+++ b/src/commands/cmd_nick.cpp
@@ -84,7 +84,7 @@ CmdResult CommandNick::Handle (const std::vector<std::string>& parameters, User
                 */
                oldnick.assign(user->nick, 0, IS_LOCAL(user) ? ServerInstance->Config->Limits.NickMax : MAXBUF);
                ModResult MOD_RESULT;
-               FIRST_MOD_RESULT(ServerInstance, OnUserPreNick, MOD_RESULT, (user,parameters[0]));
+               FIRST_MOD_RESULT(OnUserPreNick, MOD_RESULT, (user,parameters[0]));
                if (MOD_RESULT == MOD_RES_DENY)
                        return CMD_FAILURE;
                if (user->registered == REG_ALL)
@@ -111,7 +111,7 @@ CmdResult CommandNick::Handle (const std::vector<std::string>& parameters, User
                        {
                                if (user->registered == REG_ALL)
                                {
-                                       ServerInstance->SNO->WriteToSnoMask('x', "Q-Lined nickname %s from %s!%s@%s: %s",
+                                       ServerInstance->SNO->WriteGlobalSno('a', "Q-Lined nickname %s from %s!%s@%s: %s",
                                                parameters[0].c_str(), user->nick.c_str(), user->ident.c_str(), user->host.c_str(), mq->reason.c_str());
                                }
                                user->WriteNumeric(432, "%s %s :Invalid nickname: %s",user->nick.c_str(), parameters[0].c_str(), mq->reason.c_str());
@@ -165,7 +165,7 @@ CmdResult CommandNick::Handle (const std::vector<std::string>& parameters, User
 
 
        ModResult MOD_RESULT;
-       FIRST_MOD_RESULT(ServerInstance, OnUserPreNick, MOD_RESULT, (user, parameters[0]));
+       FIRST_MOD_RESULT(OnUserPreNick, MOD_RESULT, (user, parameters[0]));
        if (MOD_RESULT == MOD_RES_DENY)
                // if a module returns true, the nick change is silently forbidden.
                return CMD_FAILURE;
@@ -191,7 +191,7 @@ CmdResult CommandNick::Handle (const std::vector<std::string>& parameters, User
                if (user->registered == REG_NICKUSER)
                {
                        /* user is registered now, bit 0 = USER command, bit 1 = sent a NICK command */
-                       FIRST_MOD_RESULT(ServerInstance, OnUserRegister, MOD_RESULT, (user));
+                       FIRST_MOD_RESULT(OnUserRegister, MOD_RESULT, (user));
                        if (MOD_RESULT == MOD_RES_DENY)
                                return CMD_FAILURE;