New helper class irc::stringjoiner - it pwns you.

[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 3c9d95189e24b4dff652d49db76e6178d3faf7b8..20ffdd99eb0b5f8d7d738f7fa85e69a725b4e0b1 100644 (file)
--- a/src/modules/m_saquit.cpp
+++ b/src/modules/m_saquit.cpp
@@ -35,37 +35,38 @@ using namespace std;
 
 /* $ModDesc: Provides support for an SAQUIT command, exits user with a reason */
 
-static Server *Srv;
+
+
 
 class cmd_saquit : public command_t
 {
  public:
-       cmd_saquit () : command_t("SAQUIT",'o',2)
+ cmd_saquit (InspIRCd* Instance) : command_t(Instance,"SAQUIT",'o',2)
        {
                this->source = "m_saquit.so";
                syntax = "<nick> <reason>";
        }
 
-       void Handle (const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
        {
-               userrec* dest = Srv->FindNick(std::string(parameters[0]));
+               userrec* dest = ServerInstance->FindNick(parameters[0]);
                if (dest)
                {
-                       if (Srv->IsUlined(dest->server))
+                       if (ServerInstance->ULine(dest->server))
                        {
                                user->WriteServ("990 %s :Cannot use an SA command on a u-lined client",user->nick);
-                               return;
+                               return CMD_FAILURE;
                        }
-                       std::string line = "";
-                       for (int i = 1; i < pcnt - 1; i++)
-                       {
-                               line = line + std::string(parameters[i]) + " ";
-                       }
-                       line = line + std::string(parameters[pcnt-1]);
-               
-                       Srv->SendOpers(std::string(user->nick)+" used SAQUIT to make "+std::string(dest->nick)+" quit with a reason of "+line);
-                       userrec::QuitUser(dest, line);
+                       irc::stringjoiner reason_join(" ", parameters, 1, pcnt - 1);
+                       std::string line = reason_join.GetJoined();
+
+                       ServerInstance->WriteOpers(std::string(user->nick)+" used SAQUIT to make "+std::string(dest->nick)+" quit with a reason of "+line);
+                       userrec::QuitUser(ServerInstance, dest, line);
+
+                       return CMD_SUCCESS;
                }
+
+               return CMD_FAILURE;
        }
 };
 
@@ -73,12 +74,12 @@ class ModuleSaquit : public Module
 {
        cmd_saquit*     mycommand;
  public:
-       ModuleSaquit(Server* Me)
+       ModuleSaquit(InspIRCd* Me)
                : Module::Module(Me)
        {
-               Srv = Me;
-               mycommand = new cmd_saquit();
-               Srv->AddCommand(mycommand);
+               
+               mycommand = new cmd_saquit(ServerInstance);
+               ServerInstance->AddCommand(mycommand);
        }
        
        virtual ~ModuleSaquit()
@@ -87,7 +88,7 @@ class ModuleSaquit : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,1,VF_VENDOR);
+               return Version(1,0,0,1,VF_VENDOR,API_VERSION);
        }
        
 };
@@ -105,7 +106,7 @@ class ModuleSaquitFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleSaquit(Me);
        }