X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_safelist.cpp;h=b99c78c8385a30bd5d339a07641e149a12c0190e;hb=8be88f3e732e7a40f2e501c5e5b78c7f1b999f2d;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..b99c78c83 100644
--- a/src/modules/m_safelist.cpp
+++ b/src/modules/m_safelist.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *	    the file COPYING for details.
@@ -12,7 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "wildcard.h"
 
 /** Holds a users m_safelist state
  */
@@ -41,16 +40,16 @@ class ModuleSafeList : public Module
  public:
 	ModuleSafeList(InspIRCd* Me) : Module(Me)
 	{
-		OnRehash(NULL, "");
+		OnRehash(NULL);
 		Implementation eventlist[] = { I_OnBufferFlushed, I_OnPreCommand, I_OnCleanup, I_OnUserQuit, I_On005Numeric, I_OnRehash };
 		ServerInstance->Modules->Attach(eventlist, this, 6);
 	}
- 
+
 	virtual ~ModuleSafeList()
 	{
 	}
 
-	virtual void OnRehash(User* user, const std::string &parameter)
+	virtual void OnRehash(User* user)
 	{
 		ConfigReader MyConf(ServerInstance);
 		ThrottleSecs = MyConf.ReadInteger("safelist", "throttle", "60", 0, true);
@@ -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);
+		return Version("$Id$",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,11 +141,11 @@ class ModuleSafeList : public Module
 			user->Shrink("safelist_last");
 		}
 
- 
+
 		/*
 		 * start at channel 0! ;)
 		 */
-		ld = new ListData(0,ServerInstance->Time(), pcnt ? parameters[0] : "*", minusers, maxusers);
+		ld = new ListData(0,ServerInstance->Time(), (pcnt && (parameters[0][0] != '<' && parameters[0][0] != '>')) ? parameters[0] : "*", minusers, maxusers);
 		user->Extend("safelist_cache", ld);
 
 		time_t* llt = new time_t;
@@ -171,7 +170,7 @@ class ModuleSafeList : public Module
 			do
 			{
 				chan = ServerInstance->GetChannelIndex(ld->list_position);
-				bool has_user = (chan && chan->HasUser(user));
+				bool is_special = (chan && (chan->HasUser(user) || user->HasPrivPermission("channels/auspex")));
 				long users = chan ? chan->GetUserCounter() : 0;
 
 				bool too_few = (ld->minusers && (users <= ld->minusers));
@@ -183,37 +182,47 @@ class ModuleSafeList : public Module
 					continue;
 				}
 
-				if ((chan) && (chan->modes[CM_PRIVATE]) && (!IS_OPER(user)))
+				if (chan)
 				{
-					bool display = (match(chan->name, ld->glob) || (*chan->topic && match(chan->topic, ld->glob)));
-					if ((users) && (display))
+					bool display = (InspIRCd::Match(chan->name, ld->glob) || (!chan->topic.empty() && InspIRCd::Match(chan->topic, ld->glob)));
+
+					if (!users || !display)
 					{
+						ld->list_position++;
+						continue;
+					}
+
+					/* +s, not in chan / not got channels/auspex */
+					if (chan->IsModeSet('s') && !is_special)
+					{
+						ld->list_position++;
+						continue;
+					}
+
+					if (chan->IsModeSet('p') && !is_special)
+					{
+						/* Channel is +p and user is outside/not privileged */
 						int counter = snprintf(buffer, MAXBUF, "322 %s * %ld :", user->nick.c_str(), users);
 						amount_sent += counter + ServerNameSize;
 						user->WriteServ(std::string(buffer));
 					}
-				}
-				else if ((chan) && ((((!(chan->modes[CM_PRIVATE])) && (!(chan->modes[CM_SECRET])))) || (has_user) || IS_OPER(user)))
-				{
-					bool display = (match(chan->name, ld->glob) || (*chan->topic && match(chan->topic, ld->glob)));
-					if ((users) && (display))
+					else
 					{
-						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);
+						/* User is in the channel/privileged, channel is not +s */
+						int counter = snprintf(buffer, MAXBUF, "322 %s %s %ld :[+%s] %s", user->nick.c_str(), chan->name.c_str(), users, chan->ChanModes(is_special), chan->topic.c_str());
 						amount_sent += counter + ServerNameSize;
 						user->WriteServ(std::string(buffer));
 					}
 				}
 				else
 				{
-					if (!chan)
+					if (!ld->list_ended)
 					{
-						if (!ld->list_ended)
-						{
-							ld->list_ended = true;
-							user->WriteNumeric(323, "%s :End of channel list.",user->nick.c_str());
-						}
+						ld->list_ended = true;
+						user->WriteNumeric(323, "%s :End of channel list.",user->nick.c_str());
 					}
 				}
+
 				ld->list_position++;
 			}
 			while ((chan != NULL) && (amount_sent < (user->MyClass->GetSendqMax() / 4)));