X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_globops.cpp;h=16ce919264f36acef692377874c0a698862e0fdc;hb=8f915e5ddbab4e36bb08f9f9d726e953db1f601f;hp=1e37e1fb98b0f88a9027c3935c6f307b56e203b1;hpb=4efba4dad4b21f8ae2357a473b335e147b83a7c7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_globops.cpp b/src/modules/m_globops.cpp
index 1e37e1fb9..16ce91926 100644
--- a/src/modules/m_globops.cpp
+++ b/src/modules/m_globops.cpp
@@ -2,12 +2,9 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 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.
  *
@@ -16,102 +13,51 @@
 
 // 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!");
-			return;
-		}
-		else Srv->AddCommand("GLOBOPS",handle_globops,'o',1,"m_globops.so");
-	}
-	
-	virtual ~ModuleGlobops()
-	{
-		delete Srv;
-	}
-	
-	virtual Version GetVersion()
-	{
-		return Version(1,0,0,1,VF_STATIC|VF_VENDOR);
-	}
-	
-	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;
+			line = line + parameters[i] + " ";
 		}
-		else
-		{
-			// this mode isn't ours, we have to bail and return 0 to not handle it.
-			return 0;
-		}
-	}
+		ServerInstance->SNO->WriteGlobalSno('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()
-	{
-	}
-	
-	~ModuleGlobopsFactory()
+	ModuleGlobops() : cmd(this) {}
+
+	void init()
 	{
+		ServerInstance->AddCommand(&cmd);
+		ServerInstance->SNO->EnableSnomask('g',"GLOBOPS");
 	}
-	
-	virtual Module * CreateModule()
+
+	virtual Version GetVersion()
 	{
-		return new ModuleGlobops;
+		return Version("Provides support for GLOBOPS and user mode +g", VF_VENDOR);
 	}
-	
-};
 
+};
 
-extern "C" void * init_module( void )
-{
-	return new ModuleGlobopsFactory;
-}
-
+MODULE_INIT(ModuleGlobops)