X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_samode.cpp;h=932ed88b65c2215f76813ab6dad8d8b9a329fec7;hb=fcafba14c5408360ec725ed1649ede75b7ae52c1;hp=a563a3de560ac7bafe25d0a003baf9049bc34328;hpb=ec8a311cccb90f1397dca47c200300678a4e36aa;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_samode.cpp b/src/modules/m_samode.cpp
index a563a3de5..932ed88b6 100644
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -1,93 +1,77 @@
-/*
- * 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.
- */ 
-
-#include <stdio.h>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
+/* $ModDesc: Provides more advanced UnrealIRCd SAMODE command */
 
-Server *Srv;
-	 
-
-void handle_samode(char **parameters, int pcnt, userrec *user)
-{
-	/*
-	 * 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)
-	{
-		result=result + std::string(" ") + std::string(parameters[n]);
-		n++;
-	}
-	Srv->SendOpers(result);
-}
+#include "inspircd.h"
 
-class ModuleSaMode : public Module
+/** Handle /SAMODE
+ */
+class CommandSamode : public Command
 {
  public:
-	ModuleSaMode()
-	{
-		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;
-	}
-	
-	virtual Version GetVersion()
+	CommandSamode (InspIRCd* Instance) : Command(Instance,"SAMODE", "o", 2, false, 0)
 	{
-		return Version(1,0,2,1);
+		this->source = "m_samode.so";
+		syntax = "<target> <modes> {<mode-parameters>}";
 	}
-	
-	virtual void OnUserConnect(userrec* user)
+
+	CmdResult Handle (const std::vector<std::string>& parameters, User *user)
 	{
-	}
+		/*
+		 * Handles an SAMODE request. Notifies all +s users.
+	 	 */
+		ServerInstance->SendMode(parameters, ServerInstance->FakeClient);
 
-};
+		if (ServerInstance->Modes->GetLastParse().length())
+		{
+			ServerInstance->SNO->WriteToSnoMask('A', std::string(user->nick) + " used SAMODE: " + ServerInstance->Modes->GetLastParse());
+
+			std::string channel = parameters[0];
+			ServerInstance->PI->SendMode(channel, ServerInstance->Modes->GetLastParseParams(), ServerInstance->Modes->GetLastParseTranslate());
 
+			return CMD_LOCALONLY;
+		}
+		else
+		{
+			user->WriteServ("NOTICE %s :*** Invalid SAMODE sequence.", user->nick.c_str());
+		}
 
-class ModuleSaModeFactory : public ModuleFactory
+		return CMD_FAILURE;
+	}
+};
+
+class ModuleSaMode : public Module
 {
+	CommandSamode*	mycommand;
  public:
-	ModuleSaModeFactory()
+	ModuleSaMode(InspIRCd* Me)
+		: Module(Me)
 	{
+
+		mycommand = new CommandSamode(ServerInstance);
+		ServerInstance->AddCommand(mycommand);
+
 	}
-	
-	~ModuleSaModeFactory()
+
+	virtual ~ModuleSaMode()
 	{
 	}
-	
-	virtual Module * CreateModule()
+
+	virtual Version GetVersion()
 	{
-		return new ModuleSaMode;
+		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleSaModeFactory;
-}
+MODULE_INIT(ModuleSaMode)