X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_silence.cpp;h=c82ab3f9d6052ecf7c21f571bdfee029291b119a;hb=a5d110282a864fd2e91b51ce360a977cd0643657;hp=db2ab12d1c882ba5698000e333ded6bc227bbd0b;hpb=84a1569cd60daa64b1ae52a1fff62c0dc4d78850;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_silence.cpp b/src/modules/m_silence.cpp
index db2ab12d1..c82ab3f9d 100644
--- a/src/modules/m_silence.cpp
+++ b/src/modules/m_silence.cpp
@@ -87,7 +87,7 @@ class CommandSVSSilence : public Command
 
 		if (IS_LOCAL(u))
 		{
-			ServerInstance->Parser->CallHandler("SILENCE", std::vector<std::string>(++parameters.begin(), parameters.end()), u);
+			ServerInstance->Parser->CallHandler("SILENCE", std::vector<std::string>(parameters.begin() + 1, parameters.end()), u);
 		}
 
 		return CMD_SUCCESS;
@@ -110,6 +110,7 @@ class CommandSilence : public Command
 	CommandSilence(Module* Creator, unsigned int &max) : Command(Creator, "SILENCE", 0),
 		maxsilence(max), ext("silence_list", Creator)
 	{
+		allow_empty_last_param = false;
 		syntax = "{[+|-]<mask> <p|c|i|n|t|a|x>}";
 		TRANSLATE3(TR_TEXT, TR_TEXT, TR_END);
 	}
@@ -304,9 +305,9 @@ class ModuleSilence : public Module
 	void init()
 	{
 		OnRehash(NULL);
-		ServerInstance->AddCommand(&cmdsilence);
-		ServerInstance->AddCommand(&cmdsvssilence);
-		ServerInstance->Extensions.Register(&cmdsilence.ext);
+		ServerInstance->Modules->AddService(cmdsilence);
+		ServerInstance->Modules->AddService(cmdsvssilence);
+		ServerInstance->Modules->AddService(cmdsilence.ext);
 
 		Implementation eventlist[] = { I_OnRehash, I_On005Numeric, I_OnUserPreNotice, I_OnUserPreMessage, I_OnUserPreInvite };
 		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
@@ -314,7 +315,7 @@ class ModuleSilence : public Module
 
 	void OnRehash(User* user)
 	{
-		maxsilence = ServerInstance->Config->ConfValue("showwhois")->getInt("maxentries", 32);
+		maxsilence = ServerInstance->Config->ConfValue("silence")->getInt("maxentries", 32);
 		if (!maxsilence)
 			maxsilence = 32;
 	}