Instead of re adding the HandshakeTimer in m_spanningtree, make it a reoccurring...

[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 3dcd48ca5e872260f075a944240b65fab8a60887..932ed88b65c2215f76813ab6dad8d8b9a329fec7 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-2008 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.
@@ -26,36 +26,25 @@ class CommandSamode : public Command
                syntax = "<target> <modes> {<mode-parameters>}";
        }
 
-       CmdResult Handle (const char* const* 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->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 = parameters[0];
+                       ServerInstance->PI->SendMode(channel, ServerInstance->Modes->GetLastParseParams(), ServerInstance->Modes->GetLastParseTranslate());
 
-                       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);
+                       user->WriteServ("NOTICE %s :*** Invalid SAMODE sequence.", user->nick.c_str());
                }
 
                return CMD_FAILURE;
@@ -69,19 +58,19 @@ class ModuleSaMode : public Module
        ModuleSaMode(InspIRCd* Me)
                : Module(Me)
        {
-               
+
                mycommand = new CommandSamode(ServerInstance);
                ServerInstance->AddCommand(mycommand);
 
        }
-       
+
        virtual ~ModuleSaMode()
        {
        }
-       
+
        virtual Version GetVersion()
        {
-               return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
        }
 };