X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_samode.cpp;h=b24becb97c1ae80f2a571b5b94d031f2ee0827ee;hb=4b41feea830fc84e8c1b2fd0982f3e8d8840af96;hp=d9c75adf79d394520f8501acff5582ce400a723c;hpb=74ee9af96639323d852a8b15be72ee9974e0a826;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_samode.cpp b/src/modules/m_samode.cpp
index d9c75adf7..b24becb97 100644
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -32,16 +32,23 @@ class CommandSamode : public Command
 	bool active;
 	CommandSamode(Module* Creator) : Command(Creator,"SAMODE", 2)
 	{
+		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)
 	{
+		User* target = ServerInstance->FindNick(parameters[0]);
+		if ((target) && (target != user))
+		{
+			if (!user->HasPrivPermission("users/samode-usermodes", true))
+				return CMD_FAILURE;
+		}
 		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());
+			ServerInstance->SNO->WriteGlobalSno('a', user->nick + " used SAMODE: " +ServerInstance->Modes->GetLastParse());
 		this->active = false;
 		return CMD_SUCCESS;
 	}
@@ -54,20 +61,20 @@ class ModuleSaMode : public Module
 	ModuleSaMode()
 		: cmd(this)
 	{
-		ServerInstance->AddCommand(&cmd);
-		ServerInstance->Modules->Attach(I_OnPreMode, this);
 	}
 
-	~ModuleSaMode()
+	void init() CXX11_OVERRIDE
 	{
+		ServerInstance->Modules->AddService(cmd);
+		ServerInstance->Modules->Attach(I_OnPreMode, this);
 	}
 
-	Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Provides command SAMODE to allow opers to change modes on channels and users", VF_VENDOR);
 	}
 
-	ModResult OnPreMode(User* source,User* dest,Channel* channel, const std::vector<std::string>& parameters)
+	ModResult OnPreMode(User* source,User* dest,Channel* channel, const std::vector<std::string>& parameters) CXX11_OVERRIDE
 	{
 		if (cmd.active)
 			return MOD_RES_ALLOW;