X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_samode.cpp;h=a549f89a7a6484b4840a01bb46f5d900e44a5f57;hb=30935599479bd102db16842a8bc614d905a2ec60;hp=ae90fd2397057f1bbc6e2b15851747c58b982ccf;hpb=7f9c6c5118261eac40d9bae22ac2c0ede670512d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_samode.cpp b/src/modules/m_samode.cpp
index ae90fd239..a549f89a7 100644
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -1,114 +1,88 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- 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.
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *   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>
  *
- * ---------------------------------------------------
- */
-
-using namespace std;
-
-/*
- * SAMODE module for InspIRCd
- *  Co authored by Brain and w00t
+ * 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.
  *
- *  Syntax: /SAMODE <#chan/nick> +/-<modes> [parameters for modes]
- * 
+ * 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 */
 
-/*
- * 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(Module* Creator) : Command(Creator,"SAMODE", 2)
 	{
-		this->source = "m_samode.so";
-		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 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;
-
+		User* target = ServerInstance->FindNick(parameters[0]);
+		if ((target) && (target != user))
+		{
+			if (!user->HasPrivPermission("users/samode-usermodes", true))
+				return CMD_FAILURE;
+		}
+		this->active = true;
+		ServerInstance->Modes->Process(parameters, user);
 		if (ServerInstance->Modes->GetLastParse().length())
-			ServerInstance->WriteOpers(std::string(user->nick)+" used SAMODE: "+ServerInstance->Modes->GetLastParse());
-
+			ServerInstance->SNO->WriteGlobalSno('a', 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)
+	ModuleSaMode()
+		: cmd(this)
 	{
-		
-		mycommand = new cmd_samode(ServerInstance);
-		ServerInstance->AddCommand(mycommand);
 	}
-	
-	virtual ~ModuleSaMode()
-	{
-	}
-	
-	virtual Version GetVersion()
+
+	void init() CXX11_OVERRIDE
 	{
-		return Version(1,1,2,2,VF_VENDOR,API_VERSION);
+		ServerInstance->Modules->AddService(cmd);
 	}
-};
-
 
-class ModuleSaModeFactory : public ModuleFactory
-{
- public:
-	ModuleSaModeFactory()
+	Version GetVersion() CXX11_OVERRIDE
 	{
+		return Version("Provides command SAMODE to allow opers to change modes on channels and users", VF_VENDOR);
 	}
-	
-	~ModuleSaModeFactory()
+
+	ModResult OnPreMode(User* source,User* dest,Channel* channel, const std::vector<std::string>& parameters) CXX11_OVERRIDE
 	{
+		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_OnPreMode, PRIORITY_BEFORE, &override);
 	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleSaModeFactory;
-}
+MODULE_INIT(ModuleSaMode)