X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_securelist.cpp;h=9822f693733a8cf9093c5ef050de9a0d609b1ae6;hb=52acbb466b84a1cd161b1c111f855d6f0419fff3;hp=7e3f196ac414179f7e97bfb706af4599f483c160;hpb=7f9c6c5118261eac40d9bae22ac2c0ede670512d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_securelist.cpp b/src/modules/m_securelist.cpp
index 7e3f196ac..9822f6937 100644
--- a/src/modules/m_securelist.cpp
+++ b/src/modules/m_securelist.cpp
@@ -2,37 +2,31 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *		       E-mail:
- *		<brain@chatspike.net>
- *	   	  <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
- *	    the file COPYING for details.
+ *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
- 
+#include "inspircd.h" 
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
 
-#include <vector>
-#include "inspircd.h"
-
 /* $ModDesc: A module overriding /list, and making it safe - stop those sendq problems. */
 
 class ModuleSecureList : public Module
 {
  private:
-	 
+	std::vector<std::string> allowlist;
+	time_t WaitTime;
  public:
-	ModuleSecureList(InspIRCd* Me) : Module::Module(Me)
+	ModuleSecureList(InspIRCd* Me) : Module(Me)
 	{
-		
+		OnRehash(NULL,"");
 	}
  
 	virtual ~ModuleSecureList()
@@ -43,10 +37,20 @@ class ModuleSecureList : public Module
 	{
 		return Version(1,1,0,0,VF_VENDOR,API_VERSION);
 	}
+
+	void OnRehash(userrec* user, const std::string &parameter)
+	{
+		ConfigReader* MyConf = new ConfigReader(ServerInstance);
+		allowlist.clear();
+		for (int i = 0; i < MyConf->Enumerate("securelist"); i++)
+			allowlist.push_back(MyConf->ReadValue("securelist", "exception", i));
+		WaitTime = MyConf->ReadInteger("securelist", "waittime", "60", 0, true);
+		DELETE(MyConf);
+	}
  
 	void Implements(char* List)
 	{
-		List[I_OnPreCommand] = List[I_On005Numeric] = 1;
+		List[I_OnRehash] = List[I_OnPreCommand] = List[I_On005Numeric] = 1;
 	}
 
 	/*
@@ -59,9 +63,15 @@ class ModuleSecureList : public Module
 		if (!validated)
 			return 0;
  
-		if ((command == "LIST") && (ServerInstance->Time() < (user->signon+60)) && (!*user->oper))
+		if ((command == "LIST") && (ServerInstance->Time() < (user->signon+WaitTime)) && (!IS_OPER(user)))
 		{
-			user->WriteServ("NOTICE %s :*** You cannot list within the first minute of connecting. Please try again later.",user->nick);
+			/* Normally wouldnt be allowed here, are they exempt? */
+			for (std::vector<std::string>::iterator x = allowlist.begin(); x != allowlist.end(); x++)
+				if (ServerInstance->MatchText(user->MakeHost(), *x))
+					return 0;
+
+			/* Not exempt, BOOK EM DANNO! */
+			user->WriteServ("NOTICE %s :*** You cannot list within the first %d seconds of connecting. Please try again later.",user->nick, WaitTime);
 			/* Some crap clients (read: 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.
 			 */
@@ -106,7 +116,7 @@ class ModuleSecureListFactory : public ModuleFactory
  
 };
  
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
 	return new ModuleSecureListFactory;
 }