X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_globops.cpp;h=f02f8a1b227fe3c5c0bdc960318006ca29d1015b;hb=46e56dedd37abe33af4e8b970d5b83729dc1ef05;hp=a6d0812feaa1c0c70680a060aebd3c43ea832297;hpb=e8b5c0d9f9103f84384fe9b0d89301ecbf16c3e6;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_globops.cpp b/src/modules/m_globops.cpp
index a6d0812fe..f02f8a1b2 100644
--- a/src/modules/m_globops.cpp
+++ b/src/modules/m_globops.cpp
@@ -1,101 +1,69 @@
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  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.
+ *
+ * ---------------------------------------------------
+ */
+
 // 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 unreal-style GLOBOPS and umode +g */
+/* $ModDesc: Provides support for GLOBOPS and user mode +g */
 
-Server *Srv;
-	 
-void handle_globops(char **parameters, int pcnt, userrec *user)
+/** Handle /GLOBOPS
+ */
+class CommandGlobops : public Command
 {
-	std::string line = "*** GLOBOPS - From " + std::string(user->nick) + ": ";
-	for (int i = 0; i < pcnt; i++)
+ public:
+	CommandGlobops(Module* Creator) : Command(Creator,"GLOBOPS", 1,1)
 	{
-		line = line + std::string(parameters[i]) + " ";
+		flags_needed = 'o'; syntax = "<any-text>";
+		TRANSLATE2(TR_TEXT, TR_END);
 	}
-	Srv->SendToModeMask("og",WM_AND,line);
-}
-
 
-class ModuleGlobops : public Module
-{
- public:
-	ModuleGlobops()
+	CmdResult Handle (const std::vector<std::string> &parameters, User *user)
 	{
-		Srv = new Server;
-		
-		if (!Srv->AddExtendedMode('g',MT_CLIENT,true,0,0))
+		std::string line = "From " + std::string(user->nick) + ": ";
+		for (int i = 0; i < (int)parameters.size(); i++)
 		{
-			Srv->Log(DEFAULT,"*** m_globops: ERROR, failed to allocate user mode +g!");
-			printf("Could not claim usermode +g for this module!");
-			exit(0);
+			line = line + parameters[i] + " ";
 		}
-		Srv->AddCommand("GLOBOPS",handle_globops,'o',1);
-	}
-	
-	virtual ~ModuleGlobops()
-	{
-		delete Srv;
-	}
-	
-	virtual Version GetVersion()
-	{
-		return Version(1,0,0,1);
-	}
-	
-	virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params)
-	{
-		// check if this is our mode character...
-		if ((modechar == 'g') && (type == MT_CLIENT))
-  		{
-			// we dont actually do anything with the mode in this module -
-   			// just tell the core its been claimed and is ok to give users.  			
-			return 1;
-		}
-		else
-		{
-			// this mode isn't ours, we have to bail and return 0 to not handle it.
-			return 0;
-		}
-	}
+		ServerInstance->SNO->WriteToSnoMask('g',line);
+		ServerInstance->PI->SendSNONotice("g", line);
 
-	virtual void OnOper(userrec* user)
-	{
-		char* modes[2];			// only two parameters
-		modes[0] = user->nick;		// first parameter is the nick
-		modes[1] = "+g";		// second parameter is the mode
-		Srv->SendMode(modes,2,user);	// send these, forming the command "MODE <nick> +g"
+		return CMD_SUCCESS;
 	}
-
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleGlobopsFactory : public ModuleFactory
+class ModuleGlobops : public Module
 {
+	CommandGlobops cmd;
  public:
-	ModuleGlobopsFactory()
+	ModuleGlobops()
+		: cmd(this)
 	{
+		ServerInstance->AddCommand(&cmd);
+		ServerInstance->SNO->EnableSnomask('g',"GLOBOPS");
+
 	}
-	
-	~ModuleGlobopsFactory()
+
+	virtual ~ModuleGlobops()
 	{
+		ServerInstance->SNO->DisableSnomask('g');
 	}
-	
-	virtual Module * CreateModule()
+
+	virtual Version GetVersion()
 	{
-		return new ModuleGlobops;
+		return Version("Provides support for GLOBOPS and user mode +g", VF_OPTCOMMON | VF_VENDOR);
 	}
-	
-};
-
 
-extern "C" void * init_module( void )
-{
-	return new ModuleGlobopsFactory;
-}
+};
 
+MODULE_INIT(ModuleGlobops)