Add Module* creator to Command and ModeHandler

[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 b67730e27e03303eec4ef7e13bc6577181bcbaba..ccd40a3e7a064b3817501bdbbd0ef1ac2a00942a 100644 (file)
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -17,49 +17,34 @@
 
 /** Handle /SAMODE
  */
-class cmd_samode : public Command
+class CommandSamode : public Command
 {
  public:
-       cmd_samode (InspIRCd* Instance) : Command(Instance,"SAMODE", 'o', 2)
+       CommandSamode (InspIRCd* Instance, Module* Creator) : Command(Instance, Creator,"SAMODE", "o", 2, false, 0)
        {
-               this->source = "m_samode.so";
                syntax = "<target> <modes> {<mode-parameters>}";
        }
 
-       CmdResult Handle (const char** parameters, int pcnt, User *user)
+       CmdResult Handle (const std::vector<std::string>& parameters, User *user)
        {
                /*
                 * Handles an SAMODE request. Notifies all +s users.
                 */
-               ServerInstance->SendMode(parameters, pcnt, ServerInstance->FakeClient);
+               ServerInstance->SendMode(parameters, 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());
+                       ServerInstance->PI->SendSNONotice("A", 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 = parameters[0];
+                       ServerInstance->PI->SendMode(channel, ServerInstance->Modes->GetLastParseParams(), ServerInstance->Modes->GetLastParseTranslate());
 
-                       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);
+                       user->WriteServ("NOTICE %s :*** Invalid SAMODE sequence.", user->nick.c_str());
                }
 
                return CMD_FAILURE;
@@ -68,23 +53,21 @@ class cmd_samode : public Command
 
 class ModuleSaMode : public Module
 {
-       cmd_samode*     mycommand;
+       CommandSamode cmd;
  public:
        ModuleSaMode(InspIRCd* Me)
-               : Module(Me)
+               : Module(Me), cmd(Me, this)
        {
-               
-               mycommand = new cmd_samode(ServerInstance);
-               ServerInstance->AddCommand(mycommand);
+               ServerInstance->AddCommand(&cmd);
        }
-       
+
        virtual ~ModuleSaMode()
        {
        }
-       
+
        virtual Version GetVersion()
        {
-               return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("$Id$", VF_VENDOR, API_VERSION);
        }
 };