Remove SpanningTreeProtocolInterface::SendOperNotice - it was translated to a SendSNO...

[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 a5630751b35a1b76fa6a81b2a38cb612584e6b33..3dcd48ca5e872260f075a944240b65fab8a60887 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
@@ -13,57 +13,45 @@
 
 /* $ModDesc: Provides more advanced UnrealIRCd SAMODE command */
 
-#include <stdio.h>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.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());
-                       std::string one = "*";
-                       while ((one = spaced.GetToken()) != "")
+                       std::string one;
+                       while (spaced.GetToken(one))
                                n.push_back(one);
 
-                       Event rmode((char *)&n, NULL, "send_mode_explicit");
-                       rmode.Send(ServerInstance);
-
-                       n.clear();
-                       n.push_back(std::string(user->nick) + " used SAMODE: " + ServerInstance->Modes->GetLastParse());
-                       Event rmode2((char *)&n, NULL, "send_opers");
-                       rmode2.Send(ServerInstance);
+                       std::string channel = n[0];
+                       n.pop_front();
+                       ServerInstance->PI->SendMode(channel, n);
 
-                       /* 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_explicit
+                        * by the Protocol Interface
                         */
-                       return CMD_FAILURE;
+                       return CMD_LOCALONLY;
                }
                else
                {
@@ -76,14 +64,15 @@ class cmd_samode : public command_t
 
 class ModuleSaMode : public Module
 {
-       cmd_samode*     mycommand;
+       CommandSamode*  mycommand;
  public:
        ModuleSaMode(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
                
-               mycommand = new cmd_samode(ServerInstance);
+               mycommand = new CommandSamode(ServerInstance);
                ServerInstance->AddCommand(mycommand);
+
        }
        
        virtual ~ModuleSaMode()
@@ -92,31 +81,8 @@ class ModuleSaMode : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1,1,2,2,VF_VENDOR,API_VERSION);
+               return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
        }
 };
 
-
-class ModuleSaModeFactory : public ModuleFactory
-{
- public:
-       ModuleSaModeFactory()
-       {
-       }
-       
-       ~ModuleSaModeFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleSaMode(Me);
-       }
-       
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleSaModeFactory;
-}
+MODULE_INIT(ModuleSaMode)