X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_samode.cpp;h=eb30398addb2e8f6392cbd01b4b74a98b5d2f8f1;hb=de69e28a4a1aea89e410b693bbbb67890ecb0bd3;hp=480e8c20d9d85c9b2ebd5fa72cf58c9010f8ed00;hpb=1a7de41f62ea989f8f5c9fb575b5974c3be93a52;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_samode.cpp b/src/modules/m_samode.cpp
index 480e8c20d..eb30398ad 100644
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -1,93 +1,75 @@
-/*
- * SAMODE module for InspIRCd
- *  Co authored by Brain and w00t
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
  *
- *  Syntax: /SAMODE <#chan/nick> +/-<modes> [parameters for modes]
- * 
+ *  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.
+ *
+ * ---------------------------------------------------
  */
 
-/* $ModDesc: Povides more advanced UnrealIRCd SAMODE command */
-
-/*
- * ToDo:
- *   Err... not a lot really.
- */ 
+/* $ModDesc: Provides more advanced UnrealIRCd SAMODE command */
 
-#include <stdio.h>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
+#include "inspircd.h"
 
-Server *Srv;
-	 
-
-void handle_samode(char **parameters, int pcnt, userrec *user)
+/** Handle /SAMODE
+ */
+class CommandSamode : public Command
 {
-	/*
-	 * Handles an SAMODE request. Notifies all +s users.
- 	 */
-	int n=0;
-	std::string result;
-	Srv->Log(DEBUG,"SAMODE: Being handled");
-	Srv->SendMode(parameters,pcnt,user);
-	Srv->Log(DEBUG,"SAMODE: Modechange handled");
-	result = std::string(user->nick) + std::string(" used SAMODE ");
-  	while (n<pcnt)
+ public:
+	bool active;
+	CommandSamode(Module* Creator) : Command(Creator,"SAMODE", 2)
 	{
-		result=result + std::string(" ") + std::string(parameters[n]);
-		n++;
+		flags_needed = 'o'; Penalty = 0; syntax = "<target> <modes> {<mode-parameters>}";
+		active = false;
 	}
-      Srv->SendOpers(result);
-}
+
+	CmdResult Handle (const std::vector<std::string>& parameters, User *user)
+	{
+		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
 {
+	CommandSamode cmd;
  public:
 	ModuleSaMode()
+		: cmd(this)
 	{
-		Srv = new Server;
-                Srv->Log(DEBUG,"SAMODE: Pre-add cmd");
-		Srv->AddCommand("SAMODE",handle_samode,'o',2);
-		Srv->Log(DEBUG,"SAMODE: Post-add cmd");
-	}
-	
-	virtual ~ModuleSaMode()
-	{
-		delete Srv;
+		ServerInstance->AddCommand(&cmd);
+		ServerInstance->Modules->Attach(I_OnPreMode, this);
 	}
-	
-	virtual Version GetVersion()
-	{
-		return Version(1,0,2,1);
-	}
-	
-	virtual void OnUserConnect(userrec* user)
+
+	~ModuleSaMode()
 	{
 	}
 
-};
-
-
-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()
+
+	void Prioritize()
 	{
-		return new ModuleSaMode;
+		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)