X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_samode.cpp;h=f4f00f55a31443aea412f023ddbc1449a86beea1;hb=e9d1efc1ae29ee86b3c2a42bf56531afac7add6d;hp=624f0483b1bde1d75679bbb8a12e3c39cb85ef4a;hpb=211b24ba8cf6e21f435f145b0366adc8a3b62460;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_samode.cpp b/src/modules/m_samode.cpp
index 624f0483b..f4f00f55a 100644
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -2,106 +2,97 @@
  *       | 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-2007 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.
  *
  * ---------------------------------------------------
  */
 
-/*
- * 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 */
-
-/*
- * ToDo:
- *   Err... not a lot really.
- */ 
+/* $ModDesc: Provides more advanced UnrealIRCd SAMODE command */
 
-#include <stdio.h>
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
 
-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);
-}
-
-class ModuleSaMode : public Module
+/** Handle /SAMODE
+ */
+class cmd_samode : public command_t
 {
  public:
-	ModuleSaMode()
+	cmd_samode (InspIRCd* Instance) : command_t(Instance,"SAMODE", 'o', 2)
 	{
-		Srv = new Server;
-		Srv->AddCommand("SAMODE",handle_samode,'o',2,"m_samode.so");
+		this->source = "m_samode.so";
+		syntax = "<target> <modes> {<mode-parameters>}";
 	}
-	
-	virtual ~ModuleSaMode()
-	{
-		delete Srv;
-	}
-	
-	virtual Version GetVersion()
-	{
-		return Version(1,0,2,1);
-	}
-	
-	virtual void OnUserConnect(userrec* user)
+
+	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
 	{
-	}
+		/*
+		 * Handles an SAMODE request. Notifies all +s users.
+	 	 */
 
-};
+		userrec* n = new userrec(ServerInstance);
+		n->SetFd(FD_MAGIC_NUMBER);
+		ServerInstance->SendMode(parameters,pcnt,n);
+		delete n;
+
+		if (ServerInstance->Modes->GetLastParse().length())
+		{
+			ServerInstance->WriteOpers("*** " + std::string(user->nick) + " used SAMODE: " + ServerInstance->Modes->GetLastParse());
+
+			std::deque<std::string> n;
+			irc::spacesepstream spaced(ServerInstance->Modes->GetLastParse());
+			std::string one = "*";
+			while ((one = spaced.GetToken()) != "")
+				n.push_back(one);
+
+			Event rmode((char *)&n, NULL, "send_mode");
+			rmode.Send(ServerInstance);
+
+			n.clear();
+			n.push_back(std::string(user->nick) + " used SAMODE: " + ServerInstance->Modes->GetLastParse());
+			Event rmode2((char *)&n, NULL, "send_opers");
+			rmode2.Send(ServerInstance);
 
+			/* XXX: Yes, this is right. We dont want to propogate the
+			 * actual SAMODE command, just the MODE command generated
+			 * by the send_mode
+			 */
+			return CMD_LOCALONLY;
+		}
+		else
+		{
+			user->WriteServ("NOTICE %s :*** Invalid SAMODE sequence.", user->nick);
+		}
 
-class ModuleSaModeFactory : public ModuleFactory
+		return CMD_FAILURE;
+	}
+};
+
+class ModuleSaMode : public Module
 {
+	cmd_samode*	mycommand;
  public:
-	ModuleSaModeFactory()
+	ModuleSaMode(InspIRCd* Me)
+		: Module(Me)
 	{
+		
+		mycommand = new cmd_samode(ServerInstance);
+		ServerInstance->AddCommand(mycommand);
 	}
 	
-	~ModuleSaModeFactory()
+	virtual ~ModuleSaMode()
 	{
 	}
 	
-	virtual Module * CreateModule()
+	virtual Version GetVersion()
 	{
-		return new ModuleSaMode;
+		return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleSaModeFactory;
-}
+MODULE_INIT(ModuleSaMode)