X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_globops.cpp;h=6d00d5889994fb8267fcbcee4b7793a8ad6f79b4;hb=3a7023f2c595d14778b3f1f7e53d3914698dd500;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..6d00d5889 100644
--- a/src/modules/m_globops.cpp
+++ b/src/modules/m_globops.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
  *                <brain@chatspike.net>
  *           	  <Craig@chatspike.net>
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 // Globops and +g support module by C.J.Edwards
 
 #include <stdio.h>
@@ -21,76 +23,91 @@
 #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 */
+static Server *Srv;
 
-Server *Srv;
-	 
-void handle_globops(char **parameters, int pcnt, userrec *user)
+class cmd_globops : public command_t
 {
-	std::string line = "*** GLOBOPS - From " + std::string(user->nick) + ": ";
-	for (int i = 0; i < pcnt; i++)
+ public:
+	cmd_globops () : command_t("GLOBOPS",'o',1)
 	{
-		line = line + std::string(parameters[i]) + " ";
+		this->source = "m_globops.so";
 	}
-	Srv->SendToModeMask("og",WM_AND,line);
-}
-
+	
+	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]) + " ";
+		}
+		Srv->SendToModeMask("og",WM_AND,line);
+	}
+};
 
-class ModuleGlobops : public Module
+class ModeGlobops : public ModeHandler
 {
  public:
-	ModuleGlobops()
+	ModeGlobops() : ModeHandler('g', 0, 0, false, MODETYPE_USER, true) { }
+
+	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
 	{
-		Srv = new Server;
-		
-		if (!Srv->AddExtendedMode('g',MT_CLIENT,true,0,0))
+		if (adding)
 		{
-			Srv->Log(DEFAULT,"*** m_globops: ERROR, failed to allocate user mode +g!");
-			printf("Could not claim usermode +g for this module!");
-			return;
+			if (!dest->IsModeSet('g'))
+			{
+				dest->SetMode('P',true);
+				return MODEACTION_ALLOW;
+			}
 		}
-		else Srv->AddCommand("GLOBOPS",handle_globops,'o',1,"m_globops.so");
+		else
+		{
+			if (dest->IsModeSet('g'))
+			{
+				dest->SetMode('P',false);
+				return MODEACTION_ALLOW;
+			}
+		}
+
+		return MODEACTION_DENY;
+	}
+};
+
+
+class ModuleGlobops : public Module
+{
+	cmd_globops* mycommand;
+	ModeGlobops* mg;
+ public:
+	ModuleGlobops(Server* Me)
+		: Module::Module(Me)
+	{
+		Srv = Me;
+		mg = new ModeGlobops();
+		Srv->AddMode(mg, 'g');
+		mycommand = new cmd_globops();
+		Srv->AddCommand(mycommand);
 	}
 	
 	virtual ~ModuleGlobops()
 	{
-		delete Srv;
+		DELETE(mycommand);
+		DELETE(mg);
 	}
 	
 	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;
-		}
-		else
-		{
-			// this mode isn't ours, we have to bail and return 0 to not handle it.
-			return 0;
-		}
-	}
 
-	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:
@@ -102,9 +119,9 @@ class ModuleGlobopsFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule()
+	virtual Module * CreateModule(Server* Me)
 	{
-		return new ModuleGlobops;
+		return new ModuleGlobops(Me);
 	}
 	
 };