X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_silence.cpp;h=f44243126ed0c12b686ef69a6f6911c88c0ed8e7;hb=e9d1efc1ae29ee86b3c2a42bf56531afac7add6d;hp=72dbc6a7370fa1267f6c8d7222095626cc92539a;hpb=808c97dfbce2491a4de6830dcaa38148b7cc7406;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_silence.cpp b/src/modules/m_silence.cpp
index 72dbc6a73..f44243126 100644
--- a/src/modules/m_silence.cpp
+++ b/src/modules/m_silence.cpp
@@ -11,14 +11,11 @@
  * ---------------------------------------------------
  */
 
-#include <stdio.h>
-#include <string>
-#include <vector>
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
 #include "hashcomp.h"
-#include "inspircd.h"
 #include "wildcard.h"
 
 /* $ModDesc: Provides support for the /SILENCE command */
@@ -30,8 +27,9 @@ typedef std::map<irc::string, time_t> silencelist;
 
 class cmd_silence : public command_t
 {
+	unsigned int& maxsilence;
  public:
-	cmd_silence (InspIRCd* Instance) : command_t(Instance,"SILENCE", 0, 0)
+	cmd_silence (InspIRCd* Instance, unsigned int &max) : command_t(Instance,"SILENCE", 0, 0), maxsilence(max)
 	{
 		this->source = "m_silence.so";
 		syntax = "{[+|-]<mask>}";
@@ -113,6 +111,11 @@ class cmd_silence : public command_t
 					user->WriteServ("952 %s %s :%s is already on your silence list",user->nick, user->nick, mask.c_str());
 					return CMD_FAILURE;
 				}
+				if (sl->size() >= maxsilence)
+				{
+					user->WriteServ("952 %s %s :Your silence list is full",user->nick, user->nick, mask.c_str());
+					return CMD_FAILURE;
+				}
 				sl->insert(std::make_pair<irc::string, time_t>(mask.c_str(), ServerInstance->Time()));
 				user->WriteServ("951 %s %s :Added %s to silence list",user->nick, user->nick, mask.c_str());
 				return CMD_SUCCESS;
@@ -126,19 +129,28 @@ class ModuleSilence : public Module
 {
 	
 	cmd_silence* mycommand;
+	unsigned int maxsilence;
  public:
  
 	ModuleSilence(InspIRCd* Me)
-		: Module::Module(Me)
+		: Module(Me), maxsilence(32)
 	{
-		
-		mycommand = new cmd_silence(ServerInstance);
+		OnRehash(NULL, "");
+		mycommand = new cmd_silence(ServerInstance, maxsilence);
 		ServerInstance->AddCommand(mycommand);
 	}
 
 	void Implements(char* List)
 	{
-		List[I_OnUserQuit] = List[I_On005Numeric] = List[I_OnUserPreNotice] = List[I_OnUserPreMessage] = 1;
+		List[I_OnRehash] = List[I_OnUserQuit] = List[I_On005Numeric] = List[I_OnUserPreNotice] = List[I_OnUserPreMessage] = 1;
+	}
+
+	virtual void OnRehash(userrec* user, const std::string &parameter)
+	{
+		ConfigReader Conf(ServerInstance);
+		maxsilence = Conf.ReadInteger("silence", "maxentries", 0, true);
+		if (!maxsilence)
+			maxsilence = 32;
 	}
 
 	virtual void OnUserQuit(userrec* user, const std::string &reason, const std::string &oper_message)
@@ -157,7 +169,7 @@ class ModuleSilence : public Module
 	virtual void On005Numeric(std::string &output)
 	{
 		// we don't really have a limit...
-		output = output + " SILENCE=999";
+		output = output + " SILENCE=" + ConvToStr(maxsilence);
 	}
 	
 	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
@@ -196,32 +208,8 @@ class ModuleSilence : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+		return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 };
 
-
-class ModuleSilenceFactory : public ModuleFactory
-{
- public:
-	ModuleSilenceFactory()
-	{
-	}
-	
-	~ModuleSilenceFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleSilence(Me);
-	}
-	
-};
-
-
-extern "C" void * init_module( void )
-{
-	return new ModuleSilenceFactory;
-}
-
+MODULE_INIT(ModuleSilence)