X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_globops.cpp;h=89164b6002a2a9a70070ff4dcf0b8be26c09a7c9;hb=e2b0f3dc9ef4d56c71d7abda13e6139ca092e387;hp=c7889f1a70ab6d07add63e3fc17c92ac42de1468;hpb=7c0c957577a195b4819e4d7f2c9672d7c7522b0d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_globops.cpp b/src/modules/m_globops.cpp
index c7889f1a7..89164b600 100644
--- a/src/modules/m_globops.cpp
+++ b/src/modules/m_globops.cpp
@@ -1,105 +1,72 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *           	  <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *   Copyright (C) 2013, 2018-2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2012 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
+ *   Copyright (C) 2007-2008 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2004, 2006, 2010 Craig Edwards <brain@inspircd.org>
  *
- * ---------------------------------------------------
+ * 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/>.
  */
 
-using namespace std;
 
-// Globops and +g support module by C.J.Edwards
+// Globops and snomask +g module by C.J.Edwards
 
-#include <stdio.h>
-#include <string>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 
-/* $ModDesc: Provides support for GLOBOPS and user mode +g */
-
 /** Handle /GLOBOPS
  */
-class cmd_globops : public command_t
+class CommandGlobops : public Command
 {
  public:
-	cmd_globops (InspIRCd* Instance) : command_t(Instance,"GLOBOPS",'o',1)
+	CommandGlobops(Module* Creator) : Command(Creator,"GLOBOPS", 1,1)
 	{
-		this->source = "m_globops.so";
-		syntax = "<any-text>";
+		flags_needed = 'o';
+		syntax = ":<message>";
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
 	{
-		std::string line = "From " + std::string(user->nick) + ": ";
-		for (int i = 0; i < pcnt; i++)
+		if (parameters[0].empty())
 		{
-			line = line + std::string(parameters[i]) + " ";
+			user->WriteNumeric(ERR_NOTEXTTOSEND, "No text to send");
+			return CMD_FAILURE;
 		}
-		ServerInstance->SNO->WriteToSnoMask('g',line);
 
+		ServerInstance->SNO->WriteGlobalSno('g', "From " + user->nick + ": " + parameters[0]);
 		return CMD_SUCCESS;
 	}
 };
 
 class ModuleGlobops : public Module
 {
-	cmd_globops* mycommand;
+	CommandGlobops cmd;
  public:
-	ModuleGlobops(InspIRCd* Me)
-		: Module::Module(Me)
+	ModuleGlobops() : cmd(this) {}
+
+	void init() CXX11_OVERRIDE
 	{
-		mycommand = new cmd_globops(ServerInstance);
-		ServerInstance->AddCommand(mycommand);
 		ServerInstance->SNO->EnableSnomask('g',"GLOBOPS");
 	}
-	
-	virtual ~ModuleGlobops()
-	{
-		ServerInstance->SNO->DisableSnomask('g');
-		DELETE(mycommand);
-	}
-	
-	virtual Version GetVersion()
-	{
-		return Version(1, 0, 0, 1, VF_COMMON | VF_VENDOR);
-	}
 
-	void Implements(char* List)
+	Version GetVersion() CXX11_OVERRIDE
 	{
+		return Version("Adds the /GLOBOPS command which allows server operators to send messages to all server operators with the g (globops) snomask.", VF_VENDOR);
 	}
 };
 
-class ModuleGlobopsFactory : public ModuleFactory
-{
- public:
-	ModuleGlobopsFactory()
-	{
-	}
-	
-	~ModuleGlobopsFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleGlobops(Me);
-	}
-	
-};
-
-
-extern "C" void * init_module( void )
-{
-	return new ModuleGlobopsFactory;
-}
-
+MODULE_INIT(ModuleGlobops)