X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_samode.cpp;h=eb30398addb2e8f6392cbd01b4b74a98b5d2f8f1;hb=67a4a9b62355ea57a2f4521ca5fc53bd4eac3a1f;hp=dc23cc990d0798a94c098213ac91a3450f56d29b;hpb=924326b4b8e28089991cdf52111c982a8dc4657c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_samode.cpp b/src/modules/m_samode.cpp
index dc23cc990..eb30398ad 100644
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -2,116 +2,74 @@
  *       | 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-2009 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;
-
-/*
- * SAMODE module for InspIRCd
- *  Co authored by Brain and w00t
- *
- *  Syntax: /SAMODE <#chan/nick> +/-<modes> [parameters for modes]
- * 
- */
-
-/* $ModDesc: Povides more advanced UnrealIRCd SAMODE command */
+/* $ModDesc: Provides more advanced UnrealIRCd SAMODE command */
 
-/*
- * ToDo:
- *   Err... not a lot really.
- */ 
+#include "inspircd.h"
 
-#include <stdio.h>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-
-static Server *Srv;
-	 
-class cmd_samode : public command_t
+/** Handle /SAMODE
+ */
+class CommandSamode : public Command
 {
  public:
-	cmd_samode () : command_t("SAMODE", 'o', 2)
+	bool active;
+	CommandSamode(Module* Creator) : Command(Creator,"SAMODE", 2)
 	{
-		this->source = "m_samode.so";
+		flags_needed = 'o'; Penalty = 0; syntax = "<target> <modes> {<mode-parameters>}";
+		active = false;
 	}
 
-	void Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const std::vector<std::string>& parameters, User *user)
 	{
-		/*
-		 * Handles an SAMODE request. Notifies all +s users.
-	 	 */
-		std::string result;
-		Srv->Log(DEBUG,"SAMODE: Being handled");
-		userrec* n = new userrec();
-		n->fd = FD_MAGIC_NUMBER;
-		Srv->SendMode(parameters,pcnt,n);
-		delete n;
-		Srv->Log(DEBUG,"SAMODE: Modechange handled");
-		result = std::string(user->nick);
-		result.append(" used SAMODE");
-	  	for (int n = 0; n < pcnt; n++)
-		{
-			result.append(" ");
-			result.append(parameters[n]);
-		}
-		Srv->SendOpers(result);
+		this->active = true;
+		ServerInstance->Parser->CallHandler("MODE", parameters, user);
+		if (ServerInstance->Modes->GetLastParse().length())
+			ServerInstance->SNO->WriteGlobalSno('a', std::string(user->nick) + " used SAMODE: " +ServerInstance->Modes->GetLastParse());
+		this->active = false;
+		return CMD_SUCCESS;
 	}
 };
 
 class ModuleSaMode : public Module
 {
-	cmd_samode*	mycommand;
+	CommandSamode cmd;
  public:
-	ModuleSaMode(Server* Me)
-		: Module::Module(Me)
-	{
-		Srv = Me;
-		mycommand = new cmd_samode();
-		Srv->AddCommand(mycommand);
-	}
-	
-	virtual ~ModuleSaMode()
+	ModuleSaMode()
+		: cmd(this)
 	{
+		ServerInstance->AddCommand(&cmd);
+		ServerInstance->Modules->Attach(I_OnPreMode, this);
 	}
-	
-	virtual Version GetVersion()
+
+	~ModuleSaMode()
 	{
-		return Version(1,0,2,2,VF_VENDOR);
 	}
-};
-
 
-class ModuleSaModeFactory : public ModuleFactory
-{
- public:
-	ModuleSaModeFactory()
+	Version GetVersion()
 	{
+		return Version("Provides more advanced UnrealIRCd SAMODE command", VF_VENDOR);
 	}
-	
-	~ModuleSaModeFactory()
+
+	ModResult OnPreMode(User* source,User* dest,Channel* channel, const std::vector<std::string>& parameters)
 	{
+		if (cmd.active)
+			return MOD_RES_ALLOW;
+		return MOD_RES_PASSTHRU;
 	}
-	
-	virtual Module * CreateModule(Server* Me)
+
+	void Prioritize()
 	{
-		return new ModuleSaMode(Me);
+		Module *override = ServerInstance->Modules->Find("m_override.so");
+		ServerInstance->Modules->SetPriority(this, I_OnPreMode, PRIORITY_BEFORE, &override);
 	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleSaModeFactory;
-}
+MODULE_INIT(ModuleSaMode)