X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_safelist.cpp;h=831ddcac59f68f1488bee0dfbb8426eac51aee55;hb=d54fd9b1e6b31f69332a9241b5f17330c0ad61e0;hp=45177805ec9790975938d7fc3817086e01caa380;hpb=2591562ada4cb1f866e5d1c98340fb19332b3844;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_safelist.cpp b/src/modules/m_safelist.cpp
index 45177805e..831ddcac5 100644
--- a/src/modules/m_safelist.cpp
+++ b/src/modules/m_safelist.cpp
@@ -19,12 +19,9 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
-#include "message.h"
-#include <vector>
+#include "configreader.h"
 #include "inspircd.h"
-
-extern time_t TIME;
+#include "wildcard.h"
 
 class ListData : public classbase
 {
@@ -32,9 +29,10 @@ class ListData : public classbase
 	long list_start;
 	long list_position;
 	bool list_ended;
+	const std::string glob;
 
 	ListData() : list_start(0), list_position(0), list_ended(false) {};
-	ListData(long pos, time_t t) : list_start(t), list_position(pos), list_ended(false) {};
+	ListData(long pos, time_t t, const std::string &pattern) : list_start(t), list_position(pos), list_ended(false), glob(pattern) {};
 };
 
 /* $ModDesc: A module overriding /list, and making it safe - stop those sendq problems. */
@@ -51,13 +49,14 @@ class ListTimer : public InspTimer
 {
  private:
 
-	Server* Srv;
 	char buffer[MAXBUF];
 	chanrec *chan;
+	InspIRCd* ServerInstance;
+	const std::string glob;
 
  public:
 
-	ListTimer(long interval, Server* Me) : InspTimer(interval,TIME), Srv(Me)
+	ListTimer(InspIRCd* Instance, long interval) : InspTimer(interval,Instance->Time()), ServerInstance(Instance)
 	{
 	}
 
@@ -73,13 +72,14 @@ class ListTimer : public InspTimer
 				/*
 				 * What we do here:
 				 *  - Get where they are up to
-				 *  - If it's > GetChannelCount, erase them from the iterator, set go_again to true
+				 *  - If it's more than total number of channels, erase
+				 *    them from the iterator, set go_again to true
 				 *  - If not, spool more channels
 				 */
 				userrec* u = (userrec*)(*iter);
 				ListData* ld;
 				u->GetExt("safelist_cache", ld);
-				if (ld->list_position > Srv->GetChannelCount())
+				if ((size_t)ld->list_position > ServerInstance->chanlist.size())
 				{
 					u->Shrink("safelist_cache");
 					DELETE(ld);
@@ -88,27 +88,29 @@ class ListTimer : public InspTimer
 					break;
 				}
 
-				log(DEBUG, "m_safelist.so: resuming spool of list to client %s at channel %ld", u->nick, ld->list_position);
+				ServerInstance->Log(DEBUG, "m_safelist.so: resuming spool of list to client %s at channel %ld", u->nick, ld->list_position);
 				chan = NULL;
 				/* Attempt to fill up to half the user's sendq with /LIST output */
 				long amount_sent = 0;
 				do
 				{
-					log(DEBUG,"Channel %ld",ld->list_position);
+					ServerInstance->Log(DEBUG,"Channel %ld",ld->list_position);
 					if (!ld->list_position)
 						u->WriteServ("321 %s Channel :Users Name",u->nick);
-					chan = Srv->GetChannelIndex(ld->list_position);
+					chan = ServerInstance->GetChannelIndex(ld->list_position);
 					/* spool details */
 					bool has_user = (chan && chan->HasUser(u));
+					if (!match(chan->name, ld->glob.c_str()))
+						continue;
 					if ((chan) && (((!(chan->modes[CM_PRIVATE])) && (!(chan->modes[CM_SECRET]))) || (has_user)))
 					{
 						long users = chan->GetUserCounter();
 						if (users)
 						{
-							int counter = snprintf(buffer,MAXBUF,"322 %s %s %ld :[+%s] %s",u->nick,chan->name,users,chanmodes(chan,has_user),chan->topic);
+							int counter = snprintf(buffer,MAXBUF,"322 %s %s %ld :[+%s] %s",u->nick,chan->name,users,chan->ChanModes(has_user),chan->topic);
 							/* Increment total plus linefeed */
-							amount_sent += counter + 4 + Srv->GetServerName().length();
-							log(DEBUG,"m_safelist.so: Sent %ld of safe %ld / 4",amount_sent,u->sendqmax);
+							amount_sent += counter + 4 + strlen(ServerInstance->Config->ServerName);
+							ServerInstance->Log(DEBUG,"m_safelist.so: Sent %ld of safe %ld / 4",amount_sent,u->sendqmax);
 							u->WriteServ(std::string(buffer));
 						}
 					}
@@ -130,23 +132,21 @@ class ListTimer : public InspTimer
 			}
 		}
 
-		ListTimer* MyTimer = new ListTimer(1,Srv);
-		Srv->AddTimer(MyTimer);
+		ListTimer* MyTimer = new ListTimer(ServerInstance,1);
+		ServerInstance->Timers->AddTimer(MyTimer);
 	}
 };
 
 class ModuleSafeList : public Module
 {
  private:
-	 Server *Srv;
+	 
 	 ListTimer* MyTimer;
  public:
-	ModuleSafeList(Server* Me) : Module::Module(Me)
+	ModuleSafeList(InspIRCd* Me) : Module::Module(Me)
 	{
-		Srv = Me;
-
-		MyTimer = new ListTimer(1,Srv);
-		Srv->AddTimer(MyTimer);
+		MyTimer = new ListTimer(ServerInstance,1);
+		ServerInstance->Timers->AddTimer(MyTimer);
 	}
  
 	virtual ~ModuleSafeList()
@@ -200,7 +200,7 @@ class ModuleSafeList : public Module
 		user->GetExt("safelist_last", last_list_time);
 		if (last_list_time)
 		{
-			if (TIME < (*last_list_time)+60)
+			if (ServerInstance->Time() < (*last_list_time)+60)
 			{
 				user->WriteServ("NOTICE %s :*** Woah there, slow down a little, you can't /LIST so often!",user->nick);
 				return 1;
@@ -213,12 +213,12 @@ class ModuleSafeList : public Module
 		/*
 		 * start at channel 0! ;)
 		 */
-		ld = new ListData(0,TIME);
+		ld = new ListData(0,ServerInstance->Time(), pcnt ? parameters[0] : "*");
 		user->Extend("safelist_cache", ld);
 		listusers.push_back(user);
 
 		time_t* llt = new time_t;
-		*llt = TIME;
+		*llt = ServerInstance->Time();
 		user->Extend("safelist_last", llt);
 	
 		return 1;
@@ -266,11 +266,8 @@ class ModuleSafeList : public Module
 	}
 
 };
- 
- 
- 
-/******************************************************************************************************/
- 
+
+
 class ModuleSafeListFactory : public ModuleFactory
 {
  public:
@@ -282,7 +279,7 @@ class ModuleSafeListFactory : public ModuleFactory
 	{
 	}
  
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
 		return new ModuleSafeList(Me);
 	}