Annotations

[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 4900a3db80af9e7dfc16aa05b32181990260a283..615ba5934ad4f224f2d22a130c8584ebf6317dea 100644 (file)
--- a/src/modules/m_saquit.cpp
+++ b/src/modules/m_saquit.cpp
@@ -35,27 +35,27 @@ using namespace std;
 
 /* $ModDesc: Provides support for an SAQUIT command, exits user with a reason */
 
-static Server *Srv;
-extern InspIRCd* ServerInstance;
+
+
 
 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 = 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++)
@@ -66,7 +66,11 @@ class cmd_saquit : public command_t
                
                        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;
        }
 };
 
@@ -74,12 +78,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()
@@ -106,7 +110,7 @@ class ModuleSaquitFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleSaquit(Me);
        }