Remove m_testcommand too

[user/henk/code/inspircd.git] / src / modules / m_nicklock.cpp

diff --git a/src/modules/m_nicklock.cpp b/src/modules/m_nicklock.cpp
index b855c6ac2d85927ba42f71d0cab59ace0980e6e1..fe669fdcb41a5f068f5e277d851a852b73e88e97 100644 (file)
--- a/src/modules/m_nicklock.cpp
+++ b/src/modules/m_nicklock.cpp
@@ -59,7 +59,7 @@ class CommandNicklock : public Command
                                return CMD_FAILURE;
                        }
 
-                       user->WriteServ("947 %s %s :Nickname now locked.", user->nick, source->nick");
+                       user->WriteServ("947 %s %s :Nickname now locked.", user->nick.c_str(), parameters[1].c_str());
                }
 
                /* If we made it this far, extend the user */
@@ -67,11 +67,11 @@ class CommandNicklock : public Command
                {
                        // This has to be done *here*, because this metadata must be stored netwide.
                        target->Extend("nick_locked", "ON");
-                       ServerInstance->SNO->WriteToSnoMask('a', user->nick+" used NICKLOCK to change and hold "+target->nick+" to "+parameters[1]);
 
                        /* Only send out nick from local server */
                        if (IS_LOCAL(target))
                        {
+                               ServerInstance->SNO->WriteGlobalSno('a', user->nick+" used NICKLOCK to change and hold "+target->nick+" to "+parameters[1]);
                                std::string oldnick = user->nick;
                                std::string newnick = target->nick;
                                if (!target->ForceNickChange(parameters[1].c_str()))
@@ -128,12 +128,11 @@ class CommandNickunlock : public Command
                        }
                }
 
-               /* If we made it this far, the command is going out on the wire so send local snotice */
-               ServerInstance->SNO->WriteToSnoMask('a', std::string(user->nick)+" used NICKUNLOCK on "+parameters[0]);
-
                if (target)
                {
                        target->Shrink("nick_locked");
+                       if (IS_LOCAL(target))
+                               ServerInstance->SNO->WriteGlobalSno('a', std::string(user->nick)+" used NICKUNLOCK on "+parameters[0]);
                        if (IS_LOCAL(user))
                                user->WriteNumeric(945, "%s %s :Nickname now unlocked.",user->nick.c_str(),target->nick.c_str());
                }