X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_samode.cpp;h=82055dad3a611a869c26691ffb027d5d9d925f4d;hb=95fd083b589d7b16df98fe00711e8ac2cf9cc871;hp=fe699eb9a9f09c66835a07426d1fffaf08264355;hpb=ab9d8fd1af3ebf028506ec543f74fd13471742dd;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_samode.cpp b/src/modules/m_samode.cpp
index fe699eb9a..82055dad3 100644
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -2,118 +2,87 @@
  *       | 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-2009 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;
-
-/*
- * 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"
-
-Server *Srv;
-	 
-class cmd_samode : public command_t
+/** Handle /SAMODE
+ */
+class CommandSamode : public Command
 {
  public:
-	cmd_samode () : command_t("SAMODE", 'o', 2)
+	CommandSamode (InspIRCd* Instance) : Command(Instance,"SAMODE", "o", 2, false, 0)
 	{
 		this->source = "m_samode.so";
+		syntax = "<target> <modes> {<mode-parameters>}";
 	}
 
-	void Handle (char **parameters, int pcnt, userrec *user)
+	CmdResult Handle (const std::vector<std::string>& parameters, User *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)
+		ServerInstance->SendMode(parameters, ServerInstance->FakeClient);
+
+		if (ServerInstance->Modes->GetLastParse().length())
 		{
-			result=result + std::string(" ") + std::string(parameters[n]);
-			n++;
+			ServerInstance->SNO->WriteToSnoMask('A', std::string(user->nick) + " used SAMODE: " + ServerInstance->Modes->GetLastParse());
+
+			std::deque<std::string> n;
+			irc::spacesepstream spaced(ServerInstance->Modes->GetLastParse());
+			std::string one;
+			while (spaced.GetToken(one))
+				n.push_back(one);
+
+			std::string channel = n[0];
+			n.pop_front();
+			ServerInstance->PI->SendMode(channel, n);
+
+			/* XXX: Yes, this is right. We dont want to propagate the
+			 * actual SAMODE command, just the MODE command generated
+			 * by the Protocol Interface
+			 */
+			return CMD_LOCALONLY;
+		}
+		else
+		{
+			user->WriteServ("NOTICE %s :*** Invalid SAMODE sequence.", user->nick.c_str());
 		}
-		Srv->SendOpers(result);
+
+		return CMD_FAILURE;
 	}
 };
 
 class ModuleSaMode : public Module
 {
-	cmd_samode*	mycommand;
+	CommandSamode*	mycommand;
  public:
-	ModuleSaMode(Server* Me)
-		: Module::Module(Me)
-	{
-		Srv = Me;
-		mycommand = new cmd_samode();
-		Srv->AddCommand(mycommand);
-	}
-	
-	virtual ~ModuleSaMode()
+	ModuleSaMode(InspIRCd* Me)
+		: Module(Me)
 	{
-	}
-	
-	virtual Version GetVersion()
-	{
-		return Version(1,0,2,2,VF_VENDOR);
-	}
-	
-	virtual void OnUserConnect(userrec* user)
-	{
-	}
-
-};
 
+		mycommand = new CommandSamode(ServerInstance);
+		ServerInstance->AddCommand(mycommand);
 
-class ModuleSaModeFactory : public ModuleFactory
-{
- public:
-	ModuleSaModeFactory()
-	{
 	}
-	
-	~ModuleSaModeFactory()
+
+	virtual ~ModuleSaMode()
 	{
 	}
-	
-	virtual Module * CreateModule(Server* Me)
+
+	virtual Version GetVersion()
 	{
-		return new ModuleSaMode(Me);
+		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleSaModeFactory;
-}
+MODULE_INIT(ModuleSaMode)