A little less debug saying WEEEE :]

[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 7f3e9f428757ec79d7129d2411a085c126b1660f..7a3a51585b45236b7abfeade4634819671bf5db8 100644 (file)
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -14,35 +14,28 @@
 /* $ModDesc: Provides more advanced UnrealIRCd SAMODE command */
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
 /** Handle /SAMODE
  */
-class cmd_samode : public command_t
+class CommandSamode : public Command
 {
  public:
-       cmd_samode (InspIRCd* Instance) : command_t(Instance,"SAMODE", 'o', 2)
+       CommandSamode (InspIRCd* Instance) : Command(Instance,"SAMODE", "o", 2, false, 0)
        {
                this->source = "m_samode.so";
                syntax = "<target> <modes> {<mode-parameters>}";
        }
 
-       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle (const char* const* parameters, int pcnt, User *user)
        {
                /*
                 * Handles an SAMODE request. Notifies all +s users.
                 */
-
-               userrec* n = new userrec(ServerInstance);
-               n->SetFd(FD_MAGIC_NUMBER);
-               ServerInstance->SendMode(parameters,pcnt,n);
-               delete n;
+               ServerInstance->SendMode(parameters, pcnt, ServerInstance->FakeClient);
 
                if (ServerInstance->Modes->GetLastParse().length())
                {
-                       ServerInstance->WriteOpers("*** " + std::string(user->nick) + " used SAMODE: " + ServerInstance->Modes->GetLastParse());
+                       ServerInstance->SNO->WriteToSnoMask('A', std::string(user->nick) + " used SAMODE: " + ServerInstance->Modes->GetLastParse());
 
                        std::deque<std::string> n;
                        irc::spacesepstream spaced(ServerInstance->Modes->GetLastParse());
@@ -58,7 +51,7 @@ class cmd_samode : public command_t
                        Event rmode2((char *)&n, NULL, "send_opers");
                        rmode2.Send(ServerInstance);
 
-                       /* XXX: Yes, this is right. We dont want to propogate the
+                       /* XXX: Yes, this is right. We dont want to propagate the
                         * actual SAMODE command, just the MODE command generated
                         * by the send_mode
                         */
@@ -75,14 +68,15 @@ class cmd_samode : public command_t
 
 class ModuleSaMode : public Module
 {
-       cmd_samode*     mycommand;
+       CommandSamode*  mycommand;
  public:
        ModuleSaMode(InspIRCd* Me)
                : Module(Me)
        {
                
-               mycommand = new cmd_samode(ServerInstance);
+               mycommand = new CommandSamode(ServerInstance);
                ServerInstance->AddCommand(mycommand);
+
        }
        
        virtual ~ModuleSaMode()