In the grand tradition of huge fucking commits:

[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 419852123dc13eea9d8510f66283d3314e5f6bef..b67730e27e03303eec4ef7e13bc6577181bcbaba 100644 (file)
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -1,94 +1,91 @@
-i/*
- * SAMODE module for InspIRCd
- *  Co authored by Brain and w00t
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
  *
- *  Syntax: /SAMODE <#chan/nick> +/-<modes> [parameters for modes]
- * 
+ *  InspIRCd: (C) 2002-2007 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.
+ *
+ * ---------------------------------------------------
  */
 
-/* $ModDesc: Povides more advanced UnrealIRCd SAMODE command */
-
-/*
- * ToDo:
- *   Err... not a lot really.
- */ 
-
-#include <stdio.h>
-
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
+/* $ModDesc: Provides more advanced UnrealIRCd SAMODE command */
 
-Server *Srv;
-        
-
-void handle_samode(char **parameters, int pcnt, userrec *user)
-{
-       /*
-        * Handles an SAMODE request. Notifies all +s users.
-        */
-       int n=0;
-       std::string result;
-       Srv->Log(DEBUG,"SAMODE: Being handled");
-       Srv->SendMode(parameters,pcnt,user);
-       Srv->Log(DEBUG,"SAMODE: Modechange handled");
-       result = std::string(user->nick) + std::string(" used SAMODE ");
-       while (n<pcnt)
-       {
-               result=result + std::string(" ") + std::string(parameters[n]);
-               n++;
-       }
-      Srv->SendOpers(result);
-}
+#include "inspircd.h"
 
-class ModuleSaMode : public Module
+/** Handle /SAMODE
+ */
+class cmd_samode : public Command
 {
  public:
-       ModuleSaMode()
+       cmd_samode (InspIRCd* Instance) : Command(Instance,"SAMODE", 'o', 2)
        {
-               Srv = new Server;
-                Srv->Log(DEBUG,"SAMODE: Pre-add cmd");
-               Srv->AddCommand("SAMODE",handle_samode,'o',2);
-               Srv->Log(DEBUG,"SAMODE: Post-add cmd");
+               this->source = "m_samode.so";
+               syntax = "<target> <modes> {<mode-parameters>}";
        }
-       
-       virtual ~ModuleSaMode()
-       {
-               delete Srv;
-       }
-       
-       virtual Version GetVersion()
-       {
-               return Version(1,0,2,1);
-       }
-       
-       virtual void OnUserConnect(userrec* user)
+
+       CmdResult Handle (const char** parameters, int pcnt, User *user)
        {
-       }
+               /*
+                * Handles an SAMODE request. Notifies all +s users.
+                */
+               ServerInstance->SendMode(parameters, pcnt, ServerInstance->FakeClient);
 
-};
+               if (ServerInstance->Modes->GetLastParse().length())
+               {
+                       ServerInstance->WriteOpers("*** " + 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);
 
-class ModuleSaModeFactory : public ModuleFactory
+                       Event rmode((char *)&n, NULL, "send_mode");
+                       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);
+
+                       /* XXX: Yes, this is right. We dont want to propagate the
+                        * actual SAMODE command, just the MODE command generated
+                        * by the send_mode
+                        */
+                       return CMD_LOCALONLY;
+               }
+               else
+               {
+                       user->WriteServ("NOTICE %s :*** Invalid SAMODE sequence.", user->nick);
+               }
+
+               return CMD_FAILURE;
+       }
+};
+
+class ModuleSaMode : public Module
 {
+       cmd_samode*     mycommand;
  public:
-       ModuleSaModeFactory()
+       ModuleSaMode(InspIRCd* Me)
+               : Module(Me)
        {
+               
+               mycommand = new cmd_samode(ServerInstance);
+               ServerInstance->AddCommand(mycommand);
        }
        
-       ~ModuleSaModeFactory()
+       virtual ~ModuleSaMode()
        {
        }
        
-       virtual Module * CreateModule()
+       virtual Version GetVersion()
        {
-               return new ModuleSaMode;
+               return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
        }
-       
 };
 
-
-extern "C" void * init_module( void )
-{
-       return new ModuleSaModeFactory;
-}
+MODULE_INIT(ModuleSaMode)