X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_globops.cpp;h=3d48eb92a1587cae80312d8dc93fc4a4a6e13090;hb=7f00015727fab50e37de46aa90d218b31c852c87;hp=d86b8ab1354e4366a8975d08746a99270a1e3466;hpb=d0b4bb3811458aa335857514e4cbb95d5c84f433;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_globops.cpp b/src/modules/m_globops.cpp
index d86b8ab13..3d48eb92a 100644
--- a/src/modules/m_globops.cpp
+++ b/src/modules/m_globops.cpp
@@ -2,20 +2,15 @@
  *       | 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.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * 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>
@@ -27,81 +22,51 @@ using namespace std;
 
 /* $ModDesc: Provides support for GLOBOPS and user mode +g */
 
-extern InspIRCd* ServerInstance;
-
+/** Handle /GLOBOPS
+ */
 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 (const char** parameters, int pcnt, userrec *user)
+
+	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
 	{
-		std::string line = "*** GLOBOPS - From " + std::string(user->nick) + ": ";
+		std::string line = "From " + std::string(user->nick) + ": ";
 		for (int i = 0; i < pcnt; i++)
 		{
 			line = line + std::string(parameters[i]) + " ";
 		}
-		ServerInstance->WriteMode("og",WM_AND,line.c_str());
-	}
-};
-
-class ModeGlobops : public ModeHandler
-{
- public:
-	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)
-	{
-		if (adding)
-		{
-			if (!dest->IsModeSet('g'))
-			{
-				dest->SetMode('P',true);
-				return MODEACTION_ALLOW;
-			}
-		}
-		else
-		{
-			if (dest->IsModeSet('g'))
-			{
-				dest->SetMode('P',false);
-				return MODEACTION_ALLOW;
-			}
-		}
+		ServerInstance->SNO->WriteToSnoMask('g',line);
 
-		return MODEACTION_DENY;
+		return CMD_SUCCESS;
 	}
 };
 
-
 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();
+		mycommand = new cmd_globops(ServerInstance);
 		ServerInstance->AddCommand(mycommand);
+		ServerInstance->SNO->EnableSnomask('g',"GLOBOPS");
 	}
 	
 	virtual ~ModuleGlobops()
 	{
+		ServerInstance->SNO->DisableSnomask('g');
 		DELETE(mycommand);
-		DELETE(mg);
 	}
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,1,VF_STATIC|VF_VENDOR);
+		return Version(1, 1, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 
 	void Implements(char* List)