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

diff --git a/src/modules/m_globops.cpp b/src/modules/m_globops.cpp
index 85b1b206e..f0a879d4b 100644
--- a/src/modules/m_globops.cpp
+++ b/src/modules/m_globops.cpp
@@ -1,3 +1,21 @@
+/*       +------------------------------------+
+ *       | 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.
+ * 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>
@@ -5,76 +23,60 @@
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
+#include "inspircd.h"
+
+/* $ModDesc: Provides support for GLOBOPS and user mode +g */
 
-/* $ModDesc: Provides support for unreal-style GLOBOPS and umode +g */
 
-Server *Srv;
-	 
-void handle_globops(char **parameters, int pcnt, userrec *user)
+
+class cmd_globops : public command_t
 {
-	std::string line = "";
-	for (int i = 0; i < pcnt; i++)
+ public:
+	cmd_globops (InspIRCd* Instance) : command_t(Instance,"GLOBOPS",'o',1)
 	{
-		line = line + string(parameters[i]) + " ";
+		this->source = "m_globops.so";
+		syntax = "<any-text>";
 	}
-	Srv->SendToModeMask("og",WM_AND,line);
-}
 
+	void Handle (const char** parameters, int pcnt, userrec *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);
+	}
+};
 
 class ModuleGlobops : public Module
 {
+	cmd_globops* mycommand;
  public:
-	ModuleGlobops()
+	ModuleGlobops(InspIRCd* Me)
+		: Module::Module(Me)
 	{
-		Srv = new Server;
-		
-		if (!Srv->AddExtendedMode('g',MT_CLIENT,true,0,0))
-		{
-			Srv->Log(DEFAULT,"*** m_globops: ERROR, failed to allocate user mode +g!");
-			printf("Could not claim usermode +g for this module!");
-			exit(0);
-		}
-		Srv->AddCommand("GLOBOPS",handle_globops,'o',1);
+		mycommand = new cmd_globops(ServerInstance);
+		ServerInstance->AddCommand(mycommand);
+		ServerInstance->SNO->EnableSnomask('g',"GLOBOPS");
 	}
 	
 	virtual ~ModuleGlobops()
 	{
-		delete Srv;
+		ServerInstance->SNO->DisableSnomask('g');
+		DELETE(mycommand);
 	}
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,1);
-	}
-	
-	virtual bool 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;
-		}
+		return Version(1,0,0,1,VF_VENDOR);
 	}
 
-	virtual void OnOper(userrec* user)
+	void Implements(char* List)
 	{
-		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"
 	}
-
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
 class ModuleGlobopsFactory : public ModuleFactory
 {
  public:
@@ -86,9 +88,9 @@ class ModuleGlobopsFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule()
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
-		return new ModuleGlobops;
+		return new ModuleGlobops(Me);
 	}
 	
 };