Blah

[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 f1d246d7196d313146698b08a572953e77bf36d0..a5630751b35a1b76fa6a81b2a38cb612584e6b33 100644 (file)
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -2,34 +2,16 @@
  *       | 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-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.
  *
  * ---------------------------------------------------
  */
 
-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"
@@ -37,38 +19,58 @@ using namespace std;
 #include "modules.h"
 #include "inspircd.h"
 
-
-extern InspIRCd* ServerInstance;
-        
+/** Handle /SAMODE
+ */
 class cmd_samode : public command_t
 {
  public:
- cmd_samode (InspIRCd* Instance) : command_t(Instance,"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");
+
                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");
-               result = std::string(user->nick);
-               result.append(" used SAMODE");
-               for (int n = 0; n < pcnt; n++)
+
+               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 ((one = spaced.GetToken()) != "")
+                               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);
+
+                       /* XXX: Yes, this is right. We dont want to propogate the
+                        * actual SAMODE command, just the MODE command generated
+                        * by the send_mode_explicit
+                        */
+                       return CMD_FAILURE;
+               }
+               else
                {
-                       result.append(" ");
-                       result.append(parameters[n]);
+                       user->WriteServ("NOTICE %s :*** Invalid SAMODE sequence.", user->nick);
                }
-               ServerInstance->WriteOpers(result);
+
+               return CMD_FAILURE;
        }
 };
 
@@ -90,7 +92,7 @@ class ModuleSaMode : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1,0,2,2,VF_VENDOR);
+               return Version(1,1,2,2,VF_VENDOR,API_VERSION);
        }
 };