X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_spy.cpp;h=12aa0d347d841c21be6bd9ba5da05190816e97c5;hb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;hp=c43cee9566676abe0e7030a73f25ea27a2f73504;hpb=58f4306bb6e1f91076fccf30a3b43a40b3d1915a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spy.cpp b/src/modules/m_spy.cpp
index c43cee956..12aa0d347 100644
--- a/src/modules/m_spy.cpp
+++ b/src/modules/m_spy.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.
@@ -14,30 +14,28 @@
 /* $ModDesc: Provides the ability to see the complete names list of channels an oper is not a member of */
 
 #include "inspircd.h"
-#include "wildcard.h"
 
 class ModuleSpy : public Module
 {
  public:
-	ModuleSpy(InspIRCd* Me) : Module(Me)
-	{
+	ModuleSpy() 	{
 		ServerInstance->Modules->Attach(I_OnUserList, this);
 	}
 
-	virtual int OnUserList(User* user, Channel* Ptr, CUList* &nameslist)
+	virtual ModResult OnUserList(User* user, Channel* Ptr)
 	{
-		/* User is an oper and is NOT on the channel */
-		if (IS_OPER(user) && !Ptr->HasUser(user))
-			return -1;
+		/* User has priv and is NOT on the channel */
+		if (user->HasPrivPermission("channels/auspex") && !Ptr->HasUser(user))
+			return MOD_RES_ALLOW;
 
-		return 0;
+		return MOD_RES_PASSTHRU;
 	}
 
 	void Prioritize()
 	{
 		/* To ensure that we get priority over namesx and delayjoin for names list generation */
 		Module* list[] = { ServerInstance->Modules->Find("m_namesx.so"), ServerInstance->Modules->Find("m_delayjoin.so") };
-		ServerInstance->Modules->SetPriority(this, I_OnUserList, PRIO_BEFORE, list, 2);
+		ServerInstance->Modules->SetPriority(this, I_OnUserList, PRIORITY_BEFORE, list, 2);
 	}
 
 	virtual ~ModuleSpy()
@@ -46,7 +44,7 @@ class ModuleSpy : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version(1, 2, 0, 0, VF_VENDOR, API_VERSION);
+		return Version("Provides the ability to see the complete names list of channels an oper is not a member of", VF_VENDOR, API_VERSION);
 	}
 };