X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_samode.cpp;h=5c3d59edb82463c48b8a0fe6bc8080ad84a201a3;hb=b7716ed57704b2b2bcc665a590aecc8f02de631d;hp=e0e751e7b83dc7a7876ce4510311e30837a01a60;hpb=1c1c5fc3f01c42a09d34594989679bbc8fb21c0d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_samode.cpp b/src/modules/m_samode.cpp
index e0e751e7b..5c3d59edb 100644
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -1,17 +1,24 @@
-/*       +------------------------------------+
- *       | 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 */
 
 #include "inspircd.h"
 
@@ -21,19 +28,49 @@ class CommandSamode : public Command
 {
  public:
 	bool active;
-	CommandSamode (InspIRCd* Instance, Module* Creator) : Command(Instance, Creator,"SAMODE", "o", 2, false, 0)
+	CommandSamode(Module* Creator) : Command(Creator,"SAMODE", 2)
 	{
-		syntax = "<target> <modes> {<mode-parameters>}";
+		allow_empty_last_param = false;
+		flags_needed = 'o'; syntax = "<target> <modes> {<mode-parameters>}";
 		active = false;
 	}
 
-	CmdResult Handle (const std::vector<std::string>& parameters, User *user)
+	CmdResult Handle(const std::vector<std::string>& parameters, User* user) CXX11_OVERRIDE
 	{
+		if (parameters[0].c_str()[0] != '#')
+		{
+			User* target = ServerInstance->FindNickOnly(parameters[0]);
+			if ((!target) || (target->registered != REG_ALL))
+			{
+				user->WriteNumeric(Numerics::NoSuchNick(parameters[0]));
+				return CMD_FAILURE;
+			}
+
+			// Changing the modes of another user requires a special permission
+			if ((target != user) && (!user->HasPrivPermission("users/samode-usermodes", true)))
+				return CMD_FAILURE;
+		}
+
+		// XXX: Make ModeParser clear LastParse
+		Modes::ChangeList emptychangelist;
+		ServerInstance->Modes->ProcessSingle(ServerInstance->FakeClient, NULL, ServerInstance->FakeClient, emptychangelist);
+
 		this->active = true;
-		ServerInstance->Parser->CallHandler("MODE", parameters, user);
-		if (ServerInstance->Modes->GetLastParse().length())
-			ServerInstance->SNO->WriteGlobalSno('a', std::string(user->nick) + " used SAMODE: " +ServerInstance->Modes->GetLastParse());
+		CmdResult result = ServerInstance->Parser.CallHandler("MODE", parameters, user);
 		this->active = false;
+
+		if (result == CMD_SUCCESS)
+		{
+			// If lastparse is empty and the MODE command handler returned CMD_SUCCESS then
+			// the client queried the list of a listmode (e.g. /SAMODE #chan b), which was
+			// handled internally by the MODE command handler.
+			//
+			// Viewing the modes of a user or a channel can also result in CMD_SUCCESS, but
+			// that is not possible with /SAMODE because we require at least 2 parameters.
+			const std::string& lastparse = ServerInstance->Modes.GetLastParse();
+			ServerInstance->SNO->WriteGlobalSno('a', user->nick + " used SAMODE: " + (lastparse.empty() ? irc::stringjoiner(parameters) : lastparse));
+		}
+
 		return CMD_SUCCESS;
 	}
 };
@@ -42,33 +79,27 @@ class ModuleSaMode : public Module
 {
 	CommandSamode cmd;
  public:
-	ModuleSaMode(InspIRCd* Me)
-		: Module(Me), cmd(Me, this)
-	{
-		ServerInstance->AddCommand(&cmd);
-		ServerInstance->Modules->Attach(I_OnAccessCheck, this);
-	}
-
-	virtual ~ModuleSaMode()
+	ModuleSaMode()
+		: cmd(this)
 	{
 	}
 
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("$Id$", VF_VENDOR, API_VERSION);
+		return Version("Provides command SAMODE to allow opers to change modes on channels and users", VF_VENDOR);
 	}
 
-	virtual ModResult OnAccessCheck(User* source,User* dest,Channel* channel,int access_type)
+	ModResult OnPreMode(User* source, User* dest, Channel* channel, Modes::ChangeList& modes) CXX11_OVERRIDE
 	{
 		if (cmd.active)
 			return MOD_RES_ALLOW;
 		return MOD_RES_PASSTHRU;
 	}
 
-	void Prioritize()
+	void Prioritize() CXX11_OVERRIDE
 	{
 		Module *override = ServerInstance->Modules->Find("m_override.so");
-		ServerInstance->Modules->SetPriority(this, I_OnAccessCheck, PRIORITY_BEFORE, &override);
+		ServerInstance->Modules->SetPriority(this, I_OnPreMode, PRIORITY_BEFORE, override);
 	}
 };