X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_globops.cpp;h=f02f8a1b227fe3c5c0bdc960318006ca29d1015b;hb=46e56dedd37abe33af4e8b970d5b83729dc1ef05;hp=df18de29b649c778982cdd6d8a5b732f63cf648f;hpb=9c5adbc7f8db966dd26c6b02c8e8fdd0ee3b964c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_globops.cpp b/src/modules/m_globops.cpp
index df18de29b..f02f8a1b2 100644
--- a/src/modules/m_globops.cpp
+++ b/src/modules/m_globops.cpp
@@ -2,128 +2,68 @@
  *       | 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.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
 // Globops and +g support module by C.J.Edwards
 
-#include <stdio.h>
-#include <string>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-
-/* $ModDesc: Provides support for unreal-style GLOBOPS and umode +g */
+#include "inspircd.h"
 
-Server *Srv;
+/* $ModDesc: Provides support for GLOBOPS and user mode +g */
 
-class cmd_globops : public command_t
+/** Handle /GLOBOPS
+ */
+class CommandGlobops : public Command
 {
  public:
-	cmd_globops () : command_t("GLOBOPS",'o',1)
+	CommandGlobops(Module* Creator) : Command(Creator,"GLOBOPS", 1,1)
 	{
-		this->source = "m_globops.so";
+		flags_needed = 'o'; syntax = "<any-text>";
+		TRANSLATE2(TR_TEXT, TR_END);
 	}
-	
-	void Handle (char **parameters, int pcnt, userrec *user)
+
+	CmdResult Handle (const std::vector<std::string> &parameters, User *user)
 	{
-		std::string line = "*** GLOBOPS - From " + std::string(user->nick) + ": ";
-		for (int i = 0; i < pcnt; i++)
+		std::string line = "From " + std::string(user->nick) + ": ";
+		for (int i = 0; i < (int)parameters.size(); i++)
 		{
-			line = line + std::string(parameters[i]) + " ";
+			line = line + parameters[i] + " ";
 		}
-		Srv->SendToModeMask("og",WM_AND,line);
+		ServerInstance->SNO->WriteToSnoMask('g',line);
+		ServerInstance->PI->SendSNONotice("g", line);
+
+		return CMD_SUCCESS;
 	}
 };
 
-
 class ModuleGlobops : public Module
 {
-	cmd_globops* mycommand;
+	CommandGlobops cmd;
  public:
-	ModuleGlobops(Server* Me)
-		: Module::Module(Me)
+	ModuleGlobops()
+		: cmd(this)
 	{
-		Srv = Me;
-		
-		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!");
-			return;
-		}
-		else
-		{
-			mycommand = new cmd_globops();
-			Srv->AddCommand(mycommand);
-		}
+		ServerInstance->AddCommand(&cmd);
+		ServerInstance->SNO->EnableSnomask('g',"GLOBOPS");
+
 	}
-	
+
 	virtual ~ModuleGlobops()
 	{
-	}
-	
-	virtual Version GetVersion()
-	{
-		return Version(1,0,0,1,VF_STATIC|VF_VENDOR);
+		ServerInstance->SNO->DisableSnomask('g');
 	}
 
-	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)
+	virtual Version GetVersion()
 	{
-		// 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("Provides support for GLOBOPS and user mode +g", VF_OPTCOMMON | VF_VENDOR);
 	}
-};
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleGlobopsFactory : public ModuleFactory
-{
- public:
-	ModuleGlobopsFactory()
-	{
-	}
-	
-	~ModuleGlobopsFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(Server* Me)
-	{
-		return new ModuleGlobops(Me);
-	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleGlobopsFactory;
-}
-
+MODULE_INIT(ModuleGlobops)