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

[user/henk/code/inspircd.git] / src / modules / m_satopic.cpp

diff --git a/src/modules/m_satopic.cpp b/src/modules/m_satopic.cpp
index fea5cd018209944f73c1e4c91ebe24428395b311..cf2cb3faa4373eb076823b1e134b318b95725fab 100644 (file)
--- a/src/modules/m_satopic.cpp
+++ b/src/modules/m_satopic.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.
@@ -21,7 +21,7 @@ class CommandSATopic : public Command
 {
  public:
        CommandSATopic (InspIRCd* Instance)
-       : Command(Instance,"SATOPIC", "o", 2, false, 0)
+       : Command(Instance,"SATOPIC", "o", 2, 2, false, 0)
        {
                this->source = "m_satopic.so";
                syntax = "<target> <topic>";
@@ -37,19 +37,17 @@ class CommandSATopic : public Command
                if(target)
                {
                        std::string newTopic = parameters[1];
-                       
+
                        // 3rd parameter overrides access checks
                        target->SetTopic(user, newTopic, true);
                        ServerInstance->SNO->WriteToSnoMask('A', user->nick + " used SATOPIC on " + target->name + ", new topic: " + newTopic);
+                       ServerInstance->PI->SendSNONotice("A", user->nick + " used SATOPIC on " + target->name + ", new topic: " + newTopic);
 
-                       /* I think this is right, the TOPIC message generated should be
-                        * propogated without the SATOPIC command itself having to be.
-                        */
                        return CMD_LOCALONLY;
                }
                else
                {
-                       user->WriteNumeric(401, "%s %s :No such nick/channel", user->nick.c_str(), target->name.c_str());
+                       user->WriteNumeric(401, "%s %s :No such nick/channel", user->nick.c_str(), parameters[0].c_str());
                        return CMD_FAILURE;
                }
        }
@@ -72,7 +70,7 @@ class ModuleSATopic : public Module
 
        virtual Version GetVersion()
        {
-               return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("$Id$", VF_VENDOR, API_VERSION);
        }
 };