X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_safelist.cpp;h=eb47e329e479225a8954d42117eb8e9d544a057e;hb=31b232eec07d0b85ce2cc7c4ebc5d5387f781dcb;hp=007e6f8900c0d2070ce5ba64f0f3901eb8f3edf0;hpb=8cb8131110c194b4c10a64215dd6a4c5e54d2bc9;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_safelist.cpp b/src/modules/m_safelist.cpp
index 007e6f890..eb47e329e 100644
--- a/src/modules/m_safelist.cpp
+++ b/src/modules/m_safelist.cpp
@@ -12,7 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "wildcard.h"
 
 /** Holds a users m_safelist state
  */
@@ -45,7 +44,7 @@ class ModuleSafeList : public Module
 		Implementation eventlist[] = { I_OnBufferFlushed, I_OnPreCommand, I_OnCleanup, I_OnUserQuit, I_On005Numeric, I_OnRehash };
 		ServerInstance->Modules->Attach(eventlist, this, 6);
 	}
- 
+
 	virtual ~ModuleSafeList()
 	{
 	}
@@ -58,30 +57,30 @@ class ModuleSafeList : public Module
 		ServerNameSize = strlen(ServerInstance->Config->ServerName) + 4;
 		global_listing = 0;
 	}
- 
+
 	virtual Version GetVersion()
 	{
 		return Version(1,2,0,0,VF_VENDOR,API_VERSION);
 	}
- 
+
 
 	/*
 	 * OnPreCommand()
 	 *   Intercept the LIST command.
-	 */ 
-	virtual int OnPreCommand(const std::string &command, const std::vector<std::string> &parameters, User *user, bool validated, const std::string &original_line)
+	 */
+	virtual int OnPreCommand(std::string &command, std::vector<std::string> &parameters, User *user, bool validated, const std::string &original_line)
 	{
 		/* If the command doesnt appear to be valid, we dont want to mess with it. */
 		if (!validated)
 			return 0;
- 
+
 		if (command == "LIST")
 		{
 			return this->HandleList(parameters, user);
 		}
 		return 0;
 	}
-	
+
 	/*
 	 * HandleList()
 	 *   Handle (override) the LIST command.
@@ -102,7 +101,7 @@ class ModuleSafeList : public Module
 		/* First, let's check if the user is currently /list'ing */
 		ListData *ld;
 		user->GetExt("safelist_cache", ld);
- 
+
 		if (ld)
 		{
 			/* user is already /list'ing, we don't want to do shit. */
@@ -142,7 +141,7 @@ class ModuleSafeList : public Module
 			user->Shrink("safelist_last");
 		}
 
- 
+
 		/*
 		 * start at channel 0! ;)
 		 */
@@ -185,7 +184,7 @@ class ModuleSafeList : public Module
 
 				if ((chan) && (chan->modes[CM_PRIVATE]) && (!IS_OPER(user)))
 				{
-					bool display = (match(chan->name, ld->glob) || (*chan->topic && match(chan->topic, ld->glob)));
+					bool display = (InspIRCd::Match(chan->name, ld->glob) || (!chan->topic.empty() && InspIRCd::Match(chan->topic, ld->glob)));
 					if ((users) && (display))
 					{
 						int counter = snprintf(buffer, MAXBUF, "322 %s * %ld :", user->nick.c_str(), users);
@@ -193,12 +192,12 @@ class ModuleSafeList : public Module
 						user->WriteServ(std::string(buffer));
 					}
 				}
-				else if ((chan) && ((((!(chan->modes[CM_PRIVATE])) && (!(chan->modes[CM_SECRET])))) || (has_user) || IS_OPER(user)))
+				else if ((chan) && ((((!(chan->IsModeSet('p'))) && (!(chan->IsModeSet('s'))))) || (has_user) || IS_OPER(user)))
 				{
-					bool display = (match(chan->name, ld->glob) || (*chan->topic && match(chan->topic, ld->glob)));
+					bool display = (InspIRCd::Match(chan->name, ld->glob) || (!chan->topic.empty() && InspIRCd::Match(chan->topic, ld->glob)));
 					if ((users) && (display))
 					{
-						int counter = snprintf(buffer, MAXBUF, "322 %s %s %ld :[+%s] %s",user->nick.c_str(), chan->name, users, chan->ChanModes(has_user || IS_OPER(user)), chan->topic);
+						int counter = snprintf(buffer, MAXBUF, "322 %s %s %ld :[+%s] %s", user->nick.c_str(), chan->name.c_str(), users, chan->ChanModes(has_user || IS_OPER(user)), chan->topic.c_str());
 						amount_sent += counter + ServerNameSize;
 						user->WriteServ(std::string(buffer));
 					}