X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_globops.cpp;h=f02f8a1b227fe3c5c0bdc960318006ca29d1015b;hb=46e56dedd37abe33af4e8b970d5b83729dc1ef05;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..f02f8a1b2 100644
--- a/src/modules/m_globops.cpp
+++ b/src/modules/m_globops.cpp
@@ -2,135 +2,68 @@
  *       | Inspire 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.
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
 // 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"
 
 /* $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)
+	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);
 	}
-	
-	void Handle (const char** parameters, int pcnt, userrec *user)
-	{
-		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());
-	}
-};
 
-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
+		std::string line = "From " + std::string(user->nick) + ": ";
+		for (int i = 0; i < (int)parameters.size(); i++)
 		{
-			if (dest->IsModeSet('g'))
-			{
-				dest->SetMode('P',false);
-				return MODEACTION_ALLOW;
-			}
+			line = line + parameters[i] + " ";
 		}
+		ServerInstance->SNO->WriteToSnoMask('g',line);
+		ServerInstance->PI->SendSNONotice("g", line);
 
-		return MODEACTION_DENY;
+		return CMD_SUCCESS;
 	}
 };
 
-
 class ModuleGlobops : public Module
 {
-	cmd_globops* mycommand;
-	ModeGlobops* mg;
+	CommandGlobops cmd;
  public:
-	ModuleGlobops(Server* Me)
-		: Module::Module(Me)
+	ModuleGlobops()
+		: cmd(this)
 	{
-		Srv = Me;
-		mg = new ModeGlobops(ServerInstance);
-		Srv->AddMode(mg, 'g');
-		mycommand = new cmd_globops();
-		Srv->AddCommand(mycommand);
+		ServerInstance->AddCommand(&cmd);
+		ServerInstance->SNO->EnableSnomask('g',"GLOBOPS");
+
 	}
-	
+
 	virtual ~ModuleGlobops()
 	{
-		DELETE(mycommand);
-		DELETE(mg);
-	}
-	
-	virtual Version GetVersion()
-	{
-		return Version(1,0,0,1,VF_STATIC|VF_VENDOR);
+		ServerInstance->SNO->DisableSnomask('g');
 	}
 
-	void Implements(char* List)
+	virtual Version GetVersion()
 	{
+		return Version("Provides support for GLOBOPS and user mode +g", VF_OPTCOMMON | VF_VENDOR);
 	}
-};
 
-class ModuleGlobopsFactory : public ModuleFactory
-{
- public:
-	ModuleGlobopsFactory()
-	{
-	}
-	
-	~ModuleGlobopsFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(Server* Me)
-	{
-		return new ModuleGlobops(Me);
-	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleGlobopsFactory;
-}
-
+MODULE_INIT(ModuleGlobops)