X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_satopic.cpp;h=040d86b9a46b68cf1e9bf09b79d4d7043e7457c2;hb=da29af8cba49d51e53d6e68237ccbf6370b6dd1f;hp=f03684ccb4725a6764ae5113f0047ad10a258b87;hpb=623c7554a2de6fcee581a4712dd8947c14a9481b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_satopic.cpp b/src/modules/m_satopic.cpp
index f03684ccb..040d86b9a 100644
--- a/src/modules/m_satopic.cpp
+++ b/src/modules/m_satopic.cpp
@@ -1,17 +1,21 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2008 Oliver Lupton <oliverlupton@gmail.com>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $ModDesc: Provides a SATOPIC command */
 
 #include "inspircd.h"
 
@@ -20,11 +24,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)
@@ -36,18 +38,15 @@ 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);
+			const std::string& newTopic = parameters[1];
+			target->SetTopic(user, newTopic);
+			ServerInstance->SNO->WriteGlobalSno('a', user->nick + " used SATOPIC on " + target->name + ", new topic: " + newTopic);
 
-			return CMD_LOCALONLY;
+			return CMD_SUCCESS;
 		}
 		else
 		{
-			user->WriteNumeric(401, "%s %s :No such nick/channel", user->nick.c_str(), parameters[0].c_str());
+			user->WriteNumeric(Numerics::NoSuchNick(parameters[0]));
 			return CMD_FAILURE;
 		}
 	}
@@ -55,22 +54,16 @@ class CommandSATopic : public Command
 
 class ModuleSATopic : public Module
 {
-	CommandSATopic*	mycommand;
+	CommandSATopic cmd;
  public:
-	ModuleSATopic(InspIRCd* Me)
-	: Module(Me)
-	{
-		mycommand = new CommandSATopic(ServerInstance);
-		ServerInstance->AddCommand(mycommand);
-	}
-
-	virtual ~ModuleSATopic()
+	ModuleSATopic()
+	: cmd(this)
 	{
 	}
 
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version(1, 2, 0, 0, VF_VENDOR, API_VERSION);
+		return Version("Provides a SATOPIC command", VF_VENDOR);
 	}
 };