X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_samode.cpp;h=c2982b44d4f534b73b28dcbd54392b40914d0d8a;hb=2df56b811b362dbf5a05a0bc7b0eee5ee4d77a40;hp=a5630751b35a1b76fa6a81b2a38cb612584e6b33;hpb=3a554ef1e9be9dbcf3de3301a4a6c2938d643bea;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_samode.cpp b/src/modules/m_samode.cpp
index a5630751b..c2982b44d 100644
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -13,61 +13,49 @@
 
 /* $ModDesc: Provides more advanced UnrealIRCd SAMODE command */
 
-#include <stdio.h>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 
 /** Handle /SAMODE
  */
-class cmd_samode : public command_t
+class CommandSamode : public Command
 {
  public:
-	cmd_samode (InspIRCd* Instance) : command_t(Instance,"SAMODE", 'o', 2)
+	CommandSamode (InspIRCd* Instance) : Command(Instance,"SAMODE", "o", 2, false, 0)
 	{
 		this->source = "m_samode.so";
 		syntax = "<target> <modes> {<mode-parameters>}";
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const std::vector<std::string>& parameters, User *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;
+		ServerInstance->SendMode(parameters, ServerInstance->FakeClient);
 
 		if (ServerInstance->Modes->GetLastParse().length())
 		{
-			ServerInstance->WriteOpers("*** " + std::string(user->nick) + " used SAMODE: " + ServerInstance->Modes->GetLastParse());
+			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 ((one = spaced.GetToken()) != "")
+			std::string one;
+			while (spaced.GetToken(one))
 				n.push_back(one);
 
-			Event rmode((char *)&n, NULL, "send_mode_explicit");
-			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);
+			std::string channel = n[0];
+			n.pop_front();
+			ServerInstance->PI->SendMode(channel, n);
 
-			/* XXX: Yes, this is right. We dont want to propogate the
+			/* XXX: Yes, this is right. We dont want to propagate the
 			 * actual SAMODE command, just the MODE command generated
-			 * by the send_mode_explicit
+			 * by the Protocol Interface
 			 */
-			return CMD_FAILURE;
+			return CMD_LOCALONLY;
 		}
 		else
 		{
-			user->WriteServ("NOTICE %s :*** Invalid SAMODE sequence.", user->nick);
+			user->WriteServ("NOTICE %s :*** Invalid SAMODE sequence.", user->nick.c_str());
 		}
 
 		return CMD_FAILURE;
@@ -76,47 +64,25 @@ class cmd_samode : public command_t
 
 class ModuleSaMode : public Module
 {
-	cmd_samode*	mycommand;
+	CommandSamode*	mycommand;
  public:
 	ModuleSaMode(InspIRCd* Me)
-		: Module::Module(Me)
+		: Module(Me)
 	{
-		
-		mycommand = new cmd_samode(ServerInstance);
+
+		mycommand = new CommandSamode(ServerInstance);
 		ServerInstance->AddCommand(mycommand);
+
 	}
-	
+
 	virtual ~ModuleSaMode()
 	{
 	}
-	
-	virtual Version GetVersion()
-	{
-		return Version(1,1,2,2,VF_VENDOR,API_VERSION);
-	}
-};
-
 
-class ModuleSaModeFactory : public ModuleFactory
-{
- public:
-	ModuleSaModeFactory()
-	{
-	}
-	
-	~ModuleSaModeFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* 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)