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 6ac963fa0dd9e875dc1276e998d9d360a8a3a99a..95c13f69a3c2b9963d0b511d410b73fa556c2d1c 100644 (file)
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -38,29 +38,29 @@ using namespace std;
 #include "inspircd.h"
 
 
-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;
-               log(DEBUG,"SAMODE: Being handled");
+               ServerInstance->Log(DEBUG,"SAMODE: Being handled");
                userrec* n = new userrec(ServerInstance);
-               n->fd = FD_MAGIC_NUMBER;
+               n->SetFd(FD_MAGIC_NUMBER);
                ServerInstance->SendMode(parameters,pcnt,n);
                delete n;
-               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++)
@@ -69,6 +69,8 @@ class cmd_samode : public command_t
                        result.append(parameters[n]);
                }
                ServerInstance->WriteOpers(result);
+
+               return CMD_SUCCESS;
        }
 };
 
@@ -80,7 +82,7 @@ class ModuleSaMode : public Module
                : Module::Module(Me)
        {
                
-               mycommand = new cmd_samode();
+               mycommand = new cmd_samode(ServerInstance);
                ServerInstance->AddCommand(mycommand);
        }