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

diff --git a/src/modules/m_samode.cpp b/src/modules/m_samode.cpp
index 104e5da33..f4f00f55a 100644
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -2,73 +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-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.
  *
  * ---------------------------------------------------
  */
 
-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 <stdio.h>
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "inspircd.h"
 
-static Server *Srv;
-extern InspIRCd* ServerInstance;
-	 
+/** Handle /SAMODE
+ */
 class cmd_samode : public command_t
 {
  public:
-	cmd_samode () : command_t("SAMODE", 'o', 2)
+	cmd_samode (InspIRCd* Instance) : command_t(Instance,"SAMODE", 'o', 2)
 	{
 		this->source = "m_samode.so";
 		syntax = "<target> <modes> {<mode-parameters>}";
 	}
 
-	void Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
 	{
 		/*
 		 * Handles an SAMODE request. Notifies all +s users.
 	 	 */
-		std::string result;
-		Srv->Log(DEBUG,"SAMODE: Being handled");
+
 		userrec* n = new userrec(ServerInstance);
-		n->fd = FD_MAGIC_NUMBER;
-		Srv->SendMode(parameters,pcnt,n);
+		n->SetFd(FD_MAGIC_NUMBER);
+		ServerInstance->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++)
+
+		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
 		{
-			result.append(" ");
-			result.append(parameters[n]);
+			user->WriteServ("NOTICE %s :*** Invalid SAMODE sequence.", user->nick);
 		}
-		ServerInstance->WriteOpers(result);
+
+		return CMD_FAILURE;
 	}
 };
 
@@ -76,12 +77,12 @@ class ModuleSaMode : public Module
 {
 	cmd_samode*	mycommand;
  public:
-	ModuleSaMode(Server* Me)
-		: Module::Module(Me)
+	ModuleSaMode(InspIRCd* Me)
+		: Module(Me)
 	{
-		Srv = Me;
-		mycommand = new cmd_samode();
-		Srv->AddCommand(mycommand);
+		
+		mycommand = new cmd_samode(ServerInstance);
+		ServerInstance->AddCommand(mycommand);
 	}
 	
 	virtual ~ModuleSaMode()
@@ -90,31 +91,8 @@ class ModuleSaMode : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,2,2,VF_VENDOR);
+		return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 };
 
-
-class ModuleSaModeFactory : public ModuleFactory
-{
- public:
-	ModuleSaModeFactory()
-	{
-	}
-	
-	~ModuleSaModeFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(Server* Me)
-	{
-		return new ModuleSaMode(Me);
-	}
-	
-};
-
-
-extern "C" void * init_module( void )
-{
-	return new ModuleSaModeFactory;
-}
+MODULE_INIT(ModuleSaMode)