X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_safelist.cpp;h=bc0b8bf3d75bd8551feef7dc98f4a82f03587349;hb=fd6ee21f2f55875984884a8413d61012e066029f;hp=000d1e7d64dd5aa89492304d1e06ff4c540d9c1f;hpb=ad3c37e38c6c170c1f7cc3232db748ebdc62aa94;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_safelist.cpp b/src/modules/m_safelist.cpp
index 000d1e7d6..bc0b8bf3d 100644
--- a/src/modules/m_safelist.cpp
+++ b/src/modules/m_safelist.cpp
@@ -20,13 +20,13 @@ using namespace std;
 #include "channels.h"
 #include "modules.h"
 #include "helperfuncs.h"
-#include "message.h"
 #include <vector>
+#include "configreader.h"
 #include "inspircd.h"
 
 extern time_t TIME;
 
-extern InspIRCd* ServerInstance;
+
 
 class ListData : public classbase
 {
@@ -53,13 +53,13 @@ class ListTimer : public InspTimer
 {
  private:
 
-	Server* Srv;
 	char buffer[MAXBUF];
 	chanrec *chan;
+	InspIRCd* ServerInstance;
 
  public:
 
-	ListTimer(long interval, Server* Me) : InspTimer(interval,TIME), Srv(Me)
+	ListTimer(InspIRCd* Instance, long interval) : InspTimer(interval,TIME), ServerInstance(Instance)
 	{
 	}
 
@@ -75,13 +75,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);
@@ -99,7 +100,7 @@ class ListTimer : public InspTimer
 					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 ((chan) && (((!(chan->modes[CM_PRIVATE])) && (!(chan->modes[CM_SECRET]))) || (has_user)))
@@ -107,9 +108,9 @@ class ListTimer : public InspTimer
 						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();
+							amount_sent += counter + 4 + strlen(ServerInstance->Config->ServerName);
 							log(DEBUG,"m_safelist.so: Sent %ld of safe %ld / 4",amount_sent,u->sendqmax);
 							u->WriteServ(std::string(buffer));
 						}
@@ -132,7 +133,7 @@ class ListTimer : public InspTimer
 			}
 		}
 
-		ListTimer* MyTimer = new ListTimer(1,Srv);
+		ListTimer* MyTimer = new ListTimer(ServerInstance,1);
 		ServerInstance->Timers->AddTimer(MyTimer);
 	}
 };
@@ -140,14 +141,12 @@ class ListTimer : public InspTimer
 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);
+		MyTimer = new ListTimer(ServerInstance,1);
 		ServerInstance->Timers->AddTimer(MyTimer);
 	}
  
@@ -284,7 +283,7 @@ class ModuleSafeListFactory : public ModuleFactory
 	{
 	}
  
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
 		return new ModuleSafeList(Me);
 	}