X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_globops.cpp;h=1fe911e805101ae636bf42428801497f31138b50;hb=91e0af0fc4889f20d2f63426f8fe379674fc0393;hp=4dbe8dfb598f41fab19e56f0052ff6c619231081;hpb=9cf56d917d92959701694477f7944d45ad2c38ed;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_globops.cpp b/src/modules/m_globops.cpp
index 4dbe8dfb5..1fe911e80 100644
--- a/src/modules/m_globops.cpp
+++ b/src/modules/m_globops.cpp
@@ -1,101 +1,60 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2004-2006 Craig Edwards <craigedwards@brainbox.cc>
  *
- * 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/>.
  */
 
-// Globops and +g support module by C.J.Edwards
 
-#include <stdio.h>
-#include <string>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "inspircd.h"
+// Globops and snomask +g module by C.J.Edwards
 
-/* $ModDesc: Provides support for GLOBOPS and user mode +g */
+#include "inspircd.h"
 
 /** 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 = "<any-text>";
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle(const std::vector<std::string>& parameters, User* user) CXX11_OVERRIDE
 	{
-		std::string line = "From " + std::string(user->nick) + ": ";
-		for (int i = 0; i < pcnt; i++)
-		{
-			line = line + std::string(parameters[i]) + " ";
-		}
-		ServerInstance->SNO->WriteToSnoMask('g',line);
-
-		/* route it (ofc :p) */
+		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(Me)
-	{
-		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, 1, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
-	}
+	ModuleGlobops() : cmd(this) {}
 
-	void Implements(char* List)
+	void init() CXX11_OVERRIDE
 	{
+		ServerInstance->SNO->EnableSnomask('g',"GLOBOPS");
 	}
-};
 
-class ModuleGlobopsFactory : public ModuleFactory
-{
- public:
-	ModuleGlobopsFactory()
-	{
-	}
-	
-	~ModuleGlobopsFactory()
+	Version GetVersion() CXX11_OVERRIDE
 	{
+		return Version("Provides support for GLOBOPS and snomask +g", VF_VENDOR);
 	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleGlobops(Me);
-	}
-	
 };
 
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleGlobopsFactory;
-}
-
+MODULE_INIT(ModuleGlobops)