fix some unitialised vectors and tidy up a bit.

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

diff --git a/src/modules/m_saquit.cpp b/src/modules/m_saquit.cpp
index 14a534d17793d85507bdebad6f6e749ca37d1920..485d03260e9adc44cb38f51ee379bcdef8ae19a1 100644 (file)
--- a/src/modules/m_saquit.cpp
+++ b/src/modules/m_saquit.cpp
@@ -20,38 +20,38 @@
 class CommandSaquit : public Command
 {
  public:
-       CommandSaquit (InspIRCd* Instance) : Command(Instance, "SAQUIT", 'o', 2, false, 0)
+       CommandSaquit (InspIRCd* Instance) : Command(Instance, "SAQUIT", "o", 2, false, 0)
        {
                this->source = "m_saquit.so";
                syntax = "<nick> <reason>";
                TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
        }
 
-       CmdResult Handle (const char** parameters, int pcnt, User *user)
+       CmdResult Handle (const std::vector<std::string>& parameters, User *user)
        {
                User* dest = ServerInstance->FindNick(parameters[0]);
                if (dest)
                {
                        if (ServerInstance->ULine(dest->server))
                        {
-                               user->WriteServ("990 %s :Cannot use an SA command on a u-lined client",user->nick);
+                               user->WriteNumeric(990, "%s :Cannot use an SA command on a u-lined client",user->nick);
                                return CMD_FAILURE;
                        }
                        
-                       irc::stringjoiner reason_join(" ", parameters, 1, pcnt - 1);
+                       irc::stringjoiner reason_join(" ", parameters, 1, parameters.size() - 1);
                        std::string line = reason_join.GetJoined();
-                       ServerInstance->SNO->WriteToSnoMask('O', std::string(user->nick)+" used SAQUIT to make "+std::string(dest->nick)+" quit with a reason of "+line);
+                       ServerInstance->SNO->WriteToSnoMask('A', std::string(user->nick)+" used SAQUIT to make "+std::string(dest->nick)+" quit with a reason of "+line);
                        
                        // Pass the command on, so the client's server can quit it properly.
                        if (!IS_LOCAL(dest))
                                return CMD_SUCCESS;
                        
-                       User::QuitUser(ServerInstance, dest, line);
+                       ServerInstance->Users->QuitUser(dest, line);
                        return CMD_SUCCESS;
                }
                else
                {
-                       user->WriteServ("NOTICE %s :*** Invalid nickname '%s'", user->nick, parameters[0]);
+                       user->WriteServ("NOTICE %s :*** Invalid nickname '%s'", user->nick, parameters[0].c_str());
                }
 
                return CMD_FAILURE;
@@ -77,7 +77,7 @@ class ModuleSaquit : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
        }
        
 };