Made SANICK not collide the user (theres no need to in the new 1.1 now we have return...

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

diff --git a/src/modules/m_samode.cpp b/src/modules/m_samode.cpp
index 012bfed89a0429a7846b7d3fd782f9d55f71398a..95c13f69a3c2b9963d0b511d410b73fa556c2d1c 100644 (file)
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -37,30 +37,30 @@ using namespace std;
 #include "modules.h"
 #include "inspircd.h"
 
-static Server *Srv;
-extern InspIRCd* ServerInstance;
+
+
         
 class cmd_samode : public command_t
 {
  public:
-       cmd_samode () : command_t("SAMODE", 'o', 2)
+       cmd_samode (InspIRCd* Instance) : command_t(Instance,"SAMODE", 'o', 2)
        {
                this->source = "m_samode.so";
                syntax = "<target> <modes> {<mode-parameters>}";
        }
 
-       void Handle (const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
        {
                /*
                 * Handles an SAMODE request. Notifies all +s users.
                 */
                std::string result;
-               Srv->Log(DEBUG,"SAMODE: Being handled");
+               ServerInstance->Log(DEBUG,"SAMODE: Being handled");
                userrec* n = new userrec(ServerInstance);
-               n->fd = FD_MAGIC_NUMBER;
-               Srv->SendMode(parameters,pcnt,n);
+               n->SetFd(FD_MAGIC_NUMBER);
+               ServerInstance->SendMode(parameters,pcnt,n);
                delete n;
-               Srv->Log(DEBUG,"SAMODE: Modechange handled");
+               ServerInstance->Log(DEBUG,"SAMODE: Modechange handled");
                result = std::string(user->nick);
                result.append(" used SAMODE");
                for (int n = 0; n < pcnt; n++)
@@ -68,7 +68,9 @@ class cmd_samode : public command_t
                        result.append(" ");
                        result.append(parameters[n]);
                }
-               Srv->SendOpers(result);
+               ServerInstance->WriteOpers(result);
+
+               return CMD_SUCCESS;
        }
 };
 
@@ -76,12 +78,12 @@ class ModuleSaMode : public Module
 {
        cmd_samode*     mycommand;
  public:
-       ModuleSaMode(Server* Me)
+       ModuleSaMode(InspIRCd* Me)
                : Module::Module(Me)
        {
-               Srv = Me;
-               mycommand = new cmd_samode();
-               Srv->AddCommand(mycommand);
+               
+               mycommand = new cmd_samode(ServerInstance);
+               ServerInstance->AddCommand(mycommand);
        }
        
        virtual ~ModuleSaMode()
@@ -106,7 +108,7 @@ class ModuleSaModeFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleSaMode(Me);
        }