X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_globops.cpp;h=85d84252b2b11875100f7b25148f40bf221980f5;hb=fc4fc43ec232407b38d7ca182cb92c5cac4287aa;hp=b16b1ee1cf51770de4dff8395975a41197210067;hpb=c2957516bca0fe70622c7668a12ade68576ddab2;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_globops.cpp b/src/modules/m_globops.cpp
index b16b1ee1c..85d84252b 100644
--- a/src/modules/m_globops.cpp
+++ b/src/modules/m_globops.cpp
@@ -1,69 +1,63 @@
-/*       +------------------------------------+
- *       | 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) 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
+
+// Globops and snomask +g module by C.J.Edwards
 
 #include "inspircd.h"
 
-/* $ModDesc: Provides support for GLOBOPS and user mode +g */
+/* $ModDesc: Provides support for GLOBOPS and snomask +g */
 
 /** Handle /GLOBOPS
  */
 class CommandGlobops : public Command
 {
  public:
-	CommandGlobops (InspIRCd* Instance) : Command(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>";
 		TRANSLATE2(TR_TEXT, TR_END);
 	}
 
-	CmdResult Handle (const char* const* parameters, int pcnt, User *user)
+	CmdResult Handle (const std::vector<std::string> &parameters, User *user)
 	{
-		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
 {
-	CommandGlobops* mycommand;
+	CommandGlobops cmd;
  public:
-	ModuleGlobops(InspIRCd* Me)
-		: Module(Me)
-	{
-		mycommand = new CommandGlobops(ServerInstance);
-		ServerInstance->AddCommand(mycommand);
-		ServerInstance->SNO->EnableSnomask('g',"GLOBOPS");
+	ModuleGlobops() : cmd(this) {}
 
-	}
-	
-	virtual ~ModuleGlobops()
+	void init()
 	{
-		ServerInstance->SNO->DisableSnomask('g');
+		ServerInstance->Modules->AddService(cmd);
+		ServerInstance->SNO->EnableSnomask('g',"GLOBOPS");
 	}
-	
+
 	virtual Version GetVersion()
 	{
-		return Version(1, 2, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides support for GLOBOPS and snomask +g", VF_VENDOR);
 	}
 
 };