X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_samode.cpp;h=e0e751e7b83dc7a7876ce4510311e30837a01a60;hb=6d57bbe05c31c79eaad02fe81cfb9c1ed6b79c58;hp=97b84efd62be07cdbe03cf900d5ffa7a99ff7849;hpb=74e081f98e81097c94a6eede15c1f2b7a0d6c0e4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_samode.cpp b/src/modules/m_samode.cpp
index 97b84efd6..e0e751e7b 100644
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -2,139 +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-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/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: Provides more advanced UnrealIRCd SAMODE command */
 
-/*
- * ToDo:
- *   Err... not a lot really.
- */ 
-
-#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)
+	bool active;
+	CommandSamode (InspIRCd* Instance, Module* Creator) : Command(Instance, Creator,"SAMODE", "o", 2, false, 0)
 	{
-		this->source = "m_samode.so";
 		syntax = "<target> <modes> {<mode-parameters>}";
+		active = false;
 	}
 
-	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;
-
+		this->active = true;
+		ServerInstance->Parser->CallHandler("MODE", parameters, user);
 		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_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);
-
-			/* XXX: Yes, this is right. We dont want to propogate the
-			 * actual SAMODE command, just the MODE command generated
-			 * by the send_mode_explicit
-			 */
-			return CMD_FAILURE;
-		}
-		else
-		{
-			user->WriteServ("NOTICE %s :*** Invalid SAMODE sequence.", user->nick);
-		}
-
-		return CMD_FAILURE;
+			ServerInstance->SNO->WriteGlobalSno('a', std::string(user->nick) + " used SAMODE: " +ServerInstance->Modes->GetLastParse());
+		this->active = false;
+		return CMD_SUCCESS;
 	}
 };
 
 class ModuleSaMode : public Module
 {
-	cmd_samode*	mycommand;
+	CommandSamode cmd;
  public:
 	ModuleSaMode(InspIRCd* Me)
-		: Module::Module(Me)
+		: Module(Me), cmd(Me, this)
 	{
-		
-		mycommand = new cmd_samode(ServerInstance);
-		ServerInstance->AddCommand(mycommand);
+		ServerInstance->AddCommand(&cmd);
+		ServerInstance->Modules->Attach(I_OnAccessCheck, this);
 	}
-	
+
 	virtual ~ModuleSaMode()
 	{
 	}
-	
+
 	virtual Version GetVersion()
 	{
-		return Version(1,1,2,2,VF_VENDOR,API_VERSION);
+		return Version("$Id$", VF_VENDOR, API_VERSION);
 	}
-};
-
 
-class ModuleSaModeFactory : public ModuleFactory
-{
- public:
-	ModuleSaModeFactory()
-	{
-	}
-	
-	~ModuleSaModeFactory()
+	virtual ModResult OnAccessCheck(User* source,User* dest,Channel* channel,int access_type)
 	{
+		if (cmd.active)
+			return MOD_RES_ALLOW;
+		return MOD_RES_PASSTHRU;
 	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
+
+	void Prioritize()
 	{
-		return new ModuleSaMode(Me);
+		Module *override = ServerInstance->Modules->Find("m_override.so");
+		ServerInstance->Modules->SetPriority(this, I_OnAccessCheck, PRIORITY_BEFORE, &override);
 	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleSaModeFactory;
-}
+MODULE_INIT(ModuleSaMode)