X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_safelist.cpp;h=5059b9f77c05933aa15867cb2f5c53c818301d41;hb=e9d1efc1ae29ee86b3c2a42bf56531afac7add6d;hp=45e4dab1196cb188d8b2c208d9ba86ab0164ab8a;hpb=98bea6aca4a6033f1b2693fbaa4935ef009eb30a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_safelist.cpp b/src/modules/m_safelist.cpp
index 45e4dab11..5059b9f77 100644
--- a/src/modules/m_safelist.cpp
+++ b/src/modules/m_safelist.cpp
@@ -10,12 +10,11 @@
  *
  * ---------------------------------------------------
  */
- 
+
+#include "inspircd.h" 
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "configreader.h"
-#include "inspircd.h"
 #include "wildcard.h"
 
 /** Holds a users m_safelist state
@@ -27,9 +26,11 @@ class ListData : public classbase
 	long list_position;
 	bool list_ended;
 	const std::string glob;
+	int minusers;
+	int maxusers;
 
 	ListData() : list_start(0), list_position(0), list_ended(false) {};
-	ListData(long pos, time_t t, const std::string &pattern) : list_start(t), list_position(pos), list_ended(false), glob(pattern) {};
+	ListData(long pos, time_t t, const std::string &pattern, int mi, int ma) : list_start(t), list_position(pos), list_ended(false), glob(pattern), minusers(mi), maxusers(ma) {};
 };
 
 /* $ModDesc: A module overriding /list, and making it safe - stop those sendq problems. */
@@ -41,7 +42,7 @@ class ModuleSafeList : public Module
 	int global_listing;
 	int LimitList;
  public:
-	ModuleSafeList(InspIRCd* Me) : Module::Module(Me)
+	ModuleSafeList(InspIRCd* Me) : Module(Me)
 	{
 		OnRehash(NULL, "");
 	}
@@ -92,7 +93,9 @@ class ModuleSafeList : public Module
 	 */
 	int HandleList(const char** parameters, int pcnt, userrec* user)
 	{
-		if (global_listing >= LimitList)
+		int minusers = 0, maxusers = 0;
+
+		if (global_listing >= LimitList && !IS_OPER(user))
 		{
 			user->WriteServ("NOTICE %s :*** Server load is currently too heavy. Please try again later.", user->nick);
 			user->WriteServ("321 %s Channel :Users Name",user->nick);
@@ -111,8 +114,21 @@ class ModuleSafeList : public Module
 		}
 
 		/* Work around mIRC suckyness. YOU SUCK, KHALED! */
-		if ((pcnt == 1) && (*parameters[0] == '<'))
-			pcnt = 0;
+		if (pcnt == 1)
+		{
+			if (*parameters[0] == '<')
+			{
+				maxusers = atoi(parameters[0]+1);
+				ServerInstance->Log(DEBUG,"Max users: %d", maxusers);
+				pcnt = 0;
+			}
+			else if (*parameters[0] == '>')
+			{
+				minusers = atoi(parameters[0]+1);
+				ServerInstance->Log(DEBUG,"Min users: %d", minusers);
+				pcnt = 0;
+			}
+		}
 
 		time_t* last_list_time;
 		user->GetExt("safelist_last", last_list_time);
@@ -134,7 +150,7 @@ class ModuleSafeList : public Module
 		/*
 		 * start at channel 0! ;)
 		 */
-		ld = new ListData(0,ServerInstance->Time(), pcnt ? parameters[0] : "*");
+		ld = new ListData(0,ServerInstance->Time(), pcnt ? parameters[0] : "*", minusers, maxusers);
 		user->Extend("safelist_cache", ld);
 
 		time_t* llt = new time_t;
@@ -160,10 +176,20 @@ class ModuleSafeList : public Module
 			{
 				chan = ServerInstance->GetChannelIndex(ld->list_position);
 				bool has_user = (chan && chan->HasUser(user));
+				long users = chan ? chan->GetUserCounter() : 0;
+
+				bool too_few = (ld->minusers && (users <= ld->minusers));
+				bool too_many = (ld->maxusers && (users >= ld->maxusers));
+
+				if (chan && (too_many || too_few))
+				{
+					ld->list_position++;
+					continue;
+				}
+
 				if ((chan) && (chan->modes[CM_PRIVATE]))
 				{
-					bool display = match(chan->name, ld->glob.c_str());
-					long users = chan->GetUserCounter();
+					bool display = (match(chan->name, ld->glob.c_str()) || (*chan->topic && match(chan->topic, ld->glob.c_str())));
 					if ((users) && (display))
 					{
 						int counter = snprintf(buffer, MAXBUF, "322 %s *", user->nick);
@@ -173,8 +199,7 @@ class ModuleSafeList : public Module
 				}
 				else if ((chan) && (((!(chan->modes[CM_PRIVATE])) && (!(chan->modes[CM_SECRET]))) || (has_user)))
 				{
-					bool display = match(chan->name, ld->glob.c_str());
-					long users = chan->GetUserCounter();
+					bool display = (match(chan->name, ld->glob.c_str()) || (*chan->topic && match(chan->topic, ld->glob.c_str())));
 					if ((users) && (display))
 					{
 						int counter = snprintf(buffer, MAXBUF, "322 %s %s %ld :[+%s] %s",user->nick, chan->name, users, chan->ChanModes(has_user), chan->topic);
@@ -216,6 +241,7 @@ class ModuleSafeList : public Module
 			{
 				u->Shrink("safelist_cache");
 				DELETE(ld);
+				global_listing--;
 			}
 			time_t* last_list_time;
 			u->GetExt("safelist_last", last_list_time);
@@ -232,33 +258,11 @@ class ModuleSafeList : public Module
 		output.append(" SAFELIST");
 	}
 
-	virtual void OnUserQuit(userrec* user, const std::string &message)
+	virtual void OnUserQuit(userrec* user, const std::string &message, const std::string &oper_message)
 	{
 		this->OnCleanup(TYPE_USER,user);
 	}
 
 };
 
-
-class ModuleSafeListFactory : public ModuleFactory
-{
- public:
-	ModuleSafeListFactory()
-	{
-	}
- 
-	~ModuleSafeListFactory()
-	{
-	}
- 
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleSafeList(Me);
-	}
- 
-};
- 
-extern "C" void * init_module( void )
-{
-	return new ModuleSafeListFactory;
-}
+MODULE_INIT(ModuleSafeList)