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 0a60862af02be5ddf5fbfac209c0e1c5e6b9577a..3dcd48ca5e872260f075a944240b65fab8a60887 100644 (file)
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -2,86 +2,77 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-/*
- * SAMODE module for InspIRCd
- *  Co authored by Brain and w00t
- *
- *  Syntax: /SAMODE <#chan/nick> +/-<modes> [parameters for modes]
- * 
- */
-
-/* $ModDesc: Povides more advanced UnrealIRCd SAMODE command */
-
-/*
- * ToDo:
- *   Err... not a lot really.
- */ 
+/* $ModDesc: Provides more advanced UnrealIRCd SAMODE command */
 
-#include <stdio.h>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 
-static Server *Srv;
-extern InspIRCd* ServerInstance;
-        
-class cmd_samode : public command_t
+/** Handle /SAMODE
+ */
+class CommandSamode : public Command
 {
  public:
-       cmd_samode () : command_t("SAMODE", 'o', 2)
+       CommandSamode (InspIRCd* Instance) : Command(Instance,"SAMODE", "o", 2, false, 0)
        {
                this->source = "m_samode.so";
                syntax = "<target> <modes> {<mode-parameters>}";
        }
 
-       void 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.
                 */
-               std::string result;
-               log(DEBUG,"SAMODE: Being handled");
-               userrec* n = new userrec(ServerInstance);
-               n->fd = FD_MAGIC_NUMBER;
-               Srv->SendMode(parameters,pcnt,n);
-               delete n;
-               log(DEBUG,"SAMODE: Modechange handled");
-               result = std::string(user->nick);
-               result.append(" used SAMODE");
-               for (int n = 0; n < pcnt; n++)
+               ServerInstance->SendMode(parameters, pcnt, ServerInstance->FakeClient);
+
+               if (ServerInstance->Modes->GetLastParse().length())
                {
-                       result.append(" ");
-                       result.append(parameters[n]);
+                       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 (spaced.GetToken(one))
+                               n.push_back(one);
+
+                       std::string channel = n[0];
+                       n.pop_front();
+                       ServerInstance->PI->SendMode(channel, n);
+
+                       /* XXX: Yes, this is right. We dont want to propagate the
+                        * actual SAMODE command, just the MODE command generated
+                        * by the Protocol Interface
+                        */
+                       return CMD_LOCALONLY;
+               }
+               else
+               {
+                       user->WriteServ("NOTICE %s :*** Invalid SAMODE sequence.", user->nick);
                }
-               ServerInstance->WriteOpers(result);
+
+               return CMD_FAILURE;
        }
 };
 
 class ModuleSaMode : public Module
 {
-       cmd_samode*     mycommand;
+       CommandSamode*  mycommand;
  public:
-       ModuleSaMode(Server* Me)
-               : Module::Module(Me)
+       ModuleSaMode(InspIRCd* Me)
+               : Module(Me)
        {
-               Srv = Me;
-               mycommand = new cmd_samode();
-               Srv->AddCommand(mycommand);
+               
+               mycommand = new CommandSamode(ServerInstance);
+               ServerInstance->AddCommand(mycommand);
+
        }
        
        virtual ~ModuleSaMode()
@@ -90,31 +81,8 @@ class ModuleSaMode : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1,0,2,2,VF_VENDOR);
+               return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
        }
 };
 
-
-class ModuleSaModeFactory : public ModuleFactory
-{
- public:
-       ModuleSaModeFactory()
-       {
-       }
-       
-       ~ModuleSaModeFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(Server* Me)
-       {
-               return new ModuleSaMode(Me);
-       }
-       
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleSaModeFactory;
-}
+MODULE_INIT(ModuleSaMode)