X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_satopic.cpp;h=7b2c3e5ebc07cd8db625e12cff61e1f66edee54a;hb=7107ec12d8640d35cfe3d5002db1bc1deb33625d;hp=fea5cd018209944f73c1e4c91ebe24428395b311;hpb=a543d3ac742a20846357e9df5d9ebffbd220a5fd;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_satopic.cpp b/src/modules/m_satopic.cpp
index fea5cd018..7b2c3e5eb 100644
--- 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.
@@ -20,11 +20,9 @@
 class CommandSATopic : public Command
 {
  public:
-	CommandSATopic (InspIRCd* Instance)
-	: Command(Instance,"SATOPIC", "o", 2, false, 0)
+	CommandSATopic(Module* Creator) : Command(Creator,"SATOPIC", 2, 2)
 	{
-		this->source = "m_satopic.so";
-		syntax = "<target> <topic>";
+		flags_needed = 'o'; Penalty = 0; syntax = "<target> <topic>";
 	}
 
 	CmdResult Handle (const std::vector<std::string>& parameters, User *user)
@@ -37,19 +35,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->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;
+			return CMD_SUCCESS;
 		}
 		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;
 		}
 	}
@@ -57,13 +53,12 @@ class CommandSATopic : public Command
 
 class ModuleSATopic : public Module
 {
-	CommandSATopic*	mycommand;
+	CommandSATopic cmd;
  public:
-	ModuleSATopic(InspIRCd* Me)
-	: Module(Me)
+	ModuleSATopic()
+	: cmd(this)
 	{
-		mycommand = new CommandSATopic(ServerInstance);
-		ServerInstance->AddCommand(mycommand);
+		ServerInstance->AddCommand(&cmd);
 	}
 
 	virtual ~ModuleSATopic()
@@ -72,7 +67,7 @@ class ModuleSATopic : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides a SATOPIC command", VF_VENDOR, API_VERSION);
 	}
 };