X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_securelist.cpp;h=5d11d27f7b0fa16b72a2e568d232745e279e0f42;hb=a5d110282a864fd2e91b51ce360a977cd0643657;hp=c13e1a8928fa3bf6a878c90ce50d8b0968299f5e;hpb=46a39046196f55b52336e19662bb7bac85b731ac;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_securelist.cpp b/src/modules/m_securelist.cpp
index c13e1a892..5d11d27f7 100644
--- a/src/modules/m_securelist.cpp
+++ b/src/modules/m_securelist.cpp
@@ -21,7 +21,7 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: A module overriding /list, and making it safe - stop those sendq problems. */
+/* $ModDesc: Disallows /LIST for recently connected clients to hinder spam bots */
 
 class ModuleSecureList : public Module
 {
@@ -29,10 +29,11 @@ class ModuleSecureList : public Module
 	std::vector<std::string> allowlist;
 	time_t WaitTime;
  public:
-	ModuleSecureList() 	{
+	void init()
+	{
 		OnRehash(NULL);
 		Implementation eventlist[] = { I_OnRehash, I_OnPreCommand, I_On005Numeric };
-		ServerInstance->Modules->Attach(eventlist, this, 3);
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
 	virtual ~ModuleSecureList()
@@ -41,18 +42,18 @@ class ModuleSecureList : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("A module overriding /list, and making it safe - stop those sendq problems.",VF_VENDOR);
+		return Version("Disallows /LIST for recently connected clients to hinder spam bots", VF_VENDOR);
 	}
 
 	void OnRehash(User* user)
 	{
-		ConfigReader MyConf;
 		allowlist.clear();
 
-		for (int i = 0; i < MyConf.Enumerate("securehost"); i++)
-			allowlist.push_back(MyConf.ReadValue("securehost", "exception", i));
+		ConfigTagList tags = ServerInstance->Config->ConfTags("securehost");
+		for (ConfigIter i = tags.first; i != tags.second; ++i)
+			allowlist.push_back(i->second->getString("exception"));
 
-		WaitTime = MyConf.ReadInteger("securelist", "waittime", "60", 0, true);
+		WaitTime = ServerInstance->Config->ConfValue("securelist")->getInt("waittime", 60);
 	}
 
 
@@ -75,7 +76,7 @@ class ModuleSecureList : public Module
 
 			/* Not exempt, BOOK EM DANNO! */
 			user->WriteServ("NOTICE %s :*** You cannot list within the first %lu seconds of connecting. Please try again later.",user->nick.c_str(), (unsigned long) WaitTime);
-			/* Some crap clients (read: mIRC, various java chat applets) muck up if they don't
+			/* Some clients (e.g. mIRC, various java chat applets) muck up if they don't
 			 * receive these numerics whenever they send LIST, so give them an empty LIST to mull over.
 			 */
 			user->WriteNumeric(321, "%s Channel :Users Name",user->nick.c_str());