X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_globops.cpp;h=1cb87324b5417cbd9803a9eed9d3011905f30874;hb=ea590a5d80741c3bc030cb0a2fcb3c59da4fd078;hp=289522d7f94688a4bf0a975fb1e90a36c8ab3134;hpb=f9636a2eff46f6829bf9e01c711ab1ba45a7d50a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_globops.cpp b/src/modules/m_globops.cpp
index 289522d7f..1cb87324b 100644
--- a/src/modules/m_globops.cpp
+++ b/src/modules/m_globops.cpp
@@ -1,136 +1,60 @@
-/*       +------------------------------------+
- *       | 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) 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 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 */
-
-static Server *Srv;
-extern InspIRCd* ServerInstance;
-
-class cmd_globops : public command_t
+/** Handle /GLOBOPS
+ */
+class CommandGlobops : public Command
 {
  public:
-	cmd_globops () : command_t("GLOBOPS",'o',1)
-	{
-		this->source = "m_globops.so";
-		syntax = "<any-text>";
-	}
-	
-	void Handle (const char** parameters, int pcnt, userrec *user)
+	CommandGlobops(Module* Creator) : Command(Creator,"GLOBOPS", 1,1)
 	{
-		std::string line = "*** GLOBOPS - From " + std::string(user->nick) + ": ";
-		for (int i = 0; i < pcnt; i++)
-		{
-			line = line + std::string(parameters[i]) + " ";
-		}
-		ServerInstance->WriteMode("og",WM_AND,line.c_str());
+		flags_needed = 'o'; syntax = "<any-text>";
 	}
-};
 
-class ModeGlobops : public ModeHandler
-{
- public:
-	ModeGlobops(InspIRCd* Instance) : ModeHandler(Instance, 'g', 0, 0, false, MODETYPE_USER, true) { }
-
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	CmdResult Handle (const std::vector<std::string> &parameters, User *user)
 	{
-		if (adding)
-		{
-			if (!dest->IsModeSet('g'))
-			{
-				dest->SetMode('P',true);
-				return MODEACTION_ALLOW;
-			}
-		}
-		else
-		{
-			if (dest->IsModeSet('g'))
-			{
-				dest->SetMode('P',false);
-				return MODEACTION_ALLOW;
-			}
-		}
-
-		return MODEACTION_DENY;
+		ServerInstance->SNO->WriteGlobalSno('g', "From " + user->nick + ": " + parameters[0]);
+		return CMD_SUCCESS;
 	}
 };
 
-
 class ModuleGlobops : public Module
 {
-	cmd_globops* mycommand;
-	ModeGlobops* mg;
+	CommandGlobops cmd;
  public:
-	ModuleGlobops(Server* Me)
-		: Module::Module(Me)
-	{
-		Srv = Me;
-		mg = new ModeGlobops(ServerInstance);
-		Srv->AddMode(mg, 'g');
-		mycommand = new cmd_globops();
-		Srv->AddCommand(mycommand);
-	}
-	
-	virtual ~ModuleGlobops()
-	{
-		DELETE(mycommand);
-		DELETE(mg);
-	}
-	
-	virtual Version GetVersion()
-	{
-		return Version(1,0,0,1,VF_STATIC|VF_VENDOR);
-	}
+	ModuleGlobops() : cmd(this) {}
 
-	void Implements(char* List)
+	void init() CXX11_OVERRIDE
 	{
+		ServerInstance->SNO->EnableSnomask('g',"GLOBOPS");
 	}
-};
 
-class ModuleGlobopsFactory : public ModuleFactory
-{
- public:
-	ModuleGlobopsFactory()
+	Version GetVersion() CXX11_OVERRIDE
 	{
+		return Version("Provides support for GLOBOPS and snomask +g", VF_VENDOR);
 	}
-	
-	~ModuleGlobopsFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(Server* Me)
-	{
-		return new ModuleGlobops(Me);
-	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleGlobopsFactory;
-}
-
+MODULE_INIT(ModuleGlobops)