X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_samode.cpp;h=08cdea4afbf6f3718e37ed6a7efd833a75ad3898;hb=551d687ec6d7ce44be35fae0dd7345fe73c4f63a;hp=d9c75adf79d394520f8501acff5582ce400a723c;hpb=eadffd640b96414f208c9bed4c290031811a764e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_samode.cpp b/src/modules/m_samode.cpp
index d9c75adf7..08cdea4af 100644
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -32,6 +32,7 @@ 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;
 	}
@@ -39,9 +40,15 @@ class CommandSamode : public Command
 	CmdResult Handle (const std::vector<std::string>& parameters, User *user)
 	{
 		this->active = true;
+		User* target = ServerInstance->FindNick(parameters[0]);
+		if ((target) && (target != user))
+		{
+			if (!user->HasPrivPermission("users/samode-usermodes", true))
+				return CMD_FAILURE;
+		}
 		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,12 +61,12 @@ class ModuleSaMode : public Module
 	ModuleSaMode()
 		: cmd(this)
 	{
-		ServerInstance->AddCommand(&cmd);
-		ServerInstance->Modules->Attach(I_OnPreMode, this);
 	}
 
-	~ModuleSaMode()
+	void init()
 	{
+		ServerInstance->Modules->AddService(cmd);
+		ServerInstance->Modules->Attach(I_OnPreMode, this);
 	}
 
 	Version GetVersion()