X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_samode.cpp;h=eb30398addb2e8f6392cbd01b4b74a98b5d2f8f1;hb=de69e28a4a1aea89e410b693bbbb67890ecb0bd3;hp=fb379310f3dc1bdee95aa62d0e5cf2fd0b699743;hpb=94afde43b086f092bf8128d76d418cb63840e8eb;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_samode.cpp b/src/modules/m_samode.cpp
index fb379310f..eb30398ad 100644
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  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.
@@ -20,72 +20,55 @@
 class CommandSamode : public Command
 {
  public:
-	CommandSamode (InspIRCd* Instance) : Command(Instance,"SAMODE", 'o', 2, false, 0)
+	bool active;
+	CommandSamode(Module* Creator) : Command(Creator,"SAMODE", 2)
 	{
-		this->source = "m_samode.so";
-		syntax = "<target> <modes> {<mode-parameters>}";
+		flags_needed = 'o'; Penalty = 0; syntax = "<target> <modes> {<mode-parameters>}";
+		active = false;
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, User *user)
+	CmdResult Handle (const std::vector<std::string>& parameters, User *user)
 	{
-		/*
-		 * Handles an SAMODE request. Notifies all +s users.
-	 	 */
-		ServerInstance->SendMode(parameters, pcnt, ServerInstance->FakeClient);
-
+		this->active = true;
+		ServerInstance->Parser->CallHandler("MODE", parameters, user);
 		if (ServerInstance->Modes->GetLastParse().length())
-		{
-			ServerInstance->SNO->WriteToSnoMask('O', 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);
-
-			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 propagate 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);
-		}
-
-		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
 {
-	CommandSamode*	mycommand;
+	CommandSamode cmd;
  public:
-	ModuleSaMode(InspIRCd* Me)
-		: Module(Me)
+	ModuleSaMode()
+		: cmd(this)
 	{
-		
-		mycommand = new CommandSamode(ServerInstance);
-		ServerInstance->AddCommand(mycommand);
+		ServerInstance->AddCommand(&cmd);
+		ServerInstance->Modules->Attach(I_OnPreMode, this);
+	}
 
+	~ModuleSaMode()
+	{
+	}
+
+	Version GetVersion()
+	{
+		return Version("Provides more advanced UnrealIRCd SAMODE command", VF_VENDOR);
 	}
-	
-	virtual ~ModuleSaMode()
+
+	ModResult OnPreMode(User* source,User* dest,Channel* channel, const std::vector<std::string>& parameters)
 	{
+		if (cmd.active)
+			return MOD_RES_ALLOW;
+		return MOD_RES_PASSTHRU;
 	}
-	
-	virtual Version GetVersion()
+
+	void Prioritize()
 	{
-		return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+		Module *override = ServerInstance->Modules->Find("m_override.so");
+		ServerInstance->Modules->SetPriority(this, I_OnPreMode, PRIORITY_BEFORE, &override);
 	}
 };