X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_globops.cpp;h=77a35294aafda02ac7a1d33a574d967c288e3184;hb=fd6ee21f2f55875984884a8413d61012e066029f;hp=ec729f7204700ce96b01e190b259d9dd2a7524ef;hpb=e2e581f0d3d5d844dc4b5210f566e5a5571a0570;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_globops.cpp b/src/modules/m_globops.cpp
index ec729f720..77a35294a 100644
--- a/src/modules/m_globops.cpp
+++ b/src/modules/m_globops.cpp
@@ -23,55 +23,80 @@ using namespace std;
 #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;
 
 class cmd_globops : public command_t
 {
  public:
-	cmd_globops () : command_t("GLOBOPS",'o',1)
+ cmd_globops (InspIRCd* Instance) : command_t(Instance,"GLOBOPS",'o',1)
 	{
 		this->source = "m_globops.so";
+		syntax = "<any-text>";
 	}
 	
-	void Handle (char **parameters, int pcnt, userrec *user)
+	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);
+		ServerInstance->WriteMode("og",WM_AND,line.c_str());
 	}
 };
 
-
-class ModuleGlobops : public Module
+class ModeGlobops : public ModeHandler
 {
-	cmd_globops* mycommand;
  public:
-	ModuleGlobops(Server* Me)
-		: Module::Module(Me)
+	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)
 	{
-		Srv = Me;
-		
-		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
 		{
-			mycommand = new cmd_globops();
-			Srv->AddCommand(mycommand);
+			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(InspIRCd* Me)
+		: Module::Module(Me)
+	{
+		
+		mg = new ModeGlobops(ServerInstance);
+		ServerInstance->AddMode(mg, 'g');
+		mycommand = new cmd_globops(ServerInstance);
+		ServerInstance->AddCommand(mycommand);
 	}
 	
 	virtual ~ModuleGlobops()
 	{
+		DELETE(mycommand);
+		DELETE(mg);
 	}
 	
 	virtual Version GetVersion()
@@ -81,28 +106,9 @@ class ModuleGlobops : public Module
 
 	void Implements(char* List)
 	{
-		List[I_OnExtendedMode] = 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;
-		}
 	}
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
 class ModuleGlobopsFactory : public ModuleFactory
 {
  public:
@@ -114,7 +120,7 @@ class ModuleGlobopsFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
 		return new ModuleGlobops(Me);
 	}