X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_samode.cpp;h=ea2ae24ab3d525cc5fc56a156e703a8056f9f0c3;hb=402a1bb010522a35600325c1a3084e092b40ca22;hp=ccd40a3e7a064b3817501bdbbd0ef1ac2a00942a;hpb=24731c63b6320be22f7b3220236271fa7476b975;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_samode.cpp b/src/modules/m_samode.cpp
index ccd40a3e7..ea2ae24ab 100644
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -1,17 +1,26 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006-2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2004-2005 Craig Edwards <craigedwards@brainbox.cc>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $ModDesc: Provides more advanced UnrealIRCd SAMODE command */
+
+/* $ModDesc: Provides command SAMODE to allow opers to change modes on channels and users */
 
 #include "inspircd.h"
 
@@ -20,34 +29,32 @@
 class CommandSamode : public Command
 {
  public:
-	CommandSamode (InspIRCd* Instance, Module* Creator) : Command(Instance, Creator,"SAMODE", "o", 2, false, 0)
+	bool active;
+	CommandSamode(Module* Creator) : Command(Creator,"SAMODE", 2)
 	{
-		syntax = "<target> <modes> {<mode-parameters>}";
+		allow_empty_last_param = false;
+		flags_needed = 'o'; Penalty = 0; syntax = "<target> <modes> {<mode-parameters>}";
+		active = false;
 	}
 
 	CmdResult Handle (const std::vector<std::string>& parameters, User *user)
 	{
-		/*
-		 * Handles an SAMODE request. Notifies all +s users.
-	 	 */
-		ServerInstance->SendMode(parameters, ServerInstance->FakeClient);
-
-		if (ServerInstance->Modes->GetLastParse().length())
+		if (parameters[0].c_str()[0] != '#')
 		{
-			ServerInstance->SNO->WriteToSnoMask('a', std::string(user->nick) + " used SAMODE: " + ServerInstance->Modes->GetLastParse());
-			ServerInstance->PI->SendSNONotice("A", user->nick + " used SAMODE: " + ServerInstance->Modes->GetLastParse());
-
-			std::string channel = parameters[0];
-			ServerInstance->PI->SendMode(channel, ServerInstance->Modes->GetLastParseParams(), ServerInstance->Modes->GetLastParseTranslate());
-
-			return CMD_LOCALONLY;
-		}
-		else
-		{
-			user->WriteServ("NOTICE %s :*** Invalid SAMODE sequence.", user->nick.c_str());
+			User* target = ServerInstance->FindNickOnly(parameters[0]);
+			if ((!target) || (target->registered != REG_ALL))
+			{
+				user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel", user->nick.c_str(), parameters[0].c_str());
+				return CMD_FAILURE;
+			}
 		}
 
-		return CMD_FAILURE;
+		this->active = true;
+		ServerInstance->Parser->CallHandler("MODE", parameters, user);
+		if (ServerInstance->Modes->GetLastParse().length())
+			ServerInstance->SNO->WriteGlobalSno('a', user->nick + " used SAMODE: " +ServerInstance->Modes->GetLastParse());
+		this->active = false;
+		return CMD_SUCCESS;
 	}
 };
 
@@ -55,19 +62,37 @@ class ModuleSaMode : public Module
 {
 	CommandSamode cmd;
  public:
-	ModuleSaMode(InspIRCd* Me)
-		: Module(Me), cmd(Me, this)
+	ModuleSaMode()
+		: cmd(this)
+	{
+	}
+
+	void init()
+	{
+		ServerInstance->Modules->AddService(cmd);
+		ServerInstance->Modules->Attach(I_OnPreMode, this);
+	}
+
+	~ModuleSaMode()
+	{
+	}
+
+	Version GetVersion()
 	{
-		ServerInstance->AddCommand(&cmd);
+		return Version("Provides command SAMODE to allow opers to change modes on channels and users", 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("$Id$", VF_VENDOR, API_VERSION);
+		Module *override = ServerInstance->Modules->Find("m_override.so");
+		ServerInstance->Modules->SetPriority(this, I_OnPreMode, PRIORITY_BEFORE, &override);
 	}
 };