X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_showwhois.cpp;h=0719a93f83a7641843e5d8b68e60e3ad143ef863;hb=d54fd9b1e6b31f69332a9241b5f17330c0ad61e0;hp=6086a08287071db2bb8c3c49756698839a144001;hpb=b9e643261230d3b71517b0bc631c3b306e7246fa;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_showwhois.cpp b/src/modules/m_showwhois.cpp
index 6086a0828..0719a93f8 100644
--- a/src/modules/m_showwhois.cpp
+++ b/src/modules/m_showwhois.cpp
@@ -1,57 +1,86 @@
 using namespace std;
 
 // showwhois module by typobox43
+// Modified by Craig
 
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
+#include "inspircd.h"
 
 /* $ModDesc: Allows opers to set +W to see when a user uses WHOIS on them */
 
-class ModuleShowwhois : public Module
-{
-		Server* Srv;
 
-	public:
-		ModuleShowwhois(Server* Me)
-			: Module::Module(Me)
-		{
-			Srv = Me;
-			Srv->AddExtendedMode('W',MT_CLIENT,true,0,0);
-		}
 
-		~ModuleShowwhois()
-		{
-		}
+class SeeWhois : public ModeHandler
+{
+ public:
+	SeeWhois(InspIRCd* Instance) : ModeHandler(Instance, 'W', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
-		void Implements(char* List)
-		{
-			List[I_OnWhois] = List[I_OnExtendedMode] = 1;
-		}
+	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	{
+		/* Only opers can change other users modes */
+		if ((source != dest) && (!*source->oper))
+			return MODEACTION_DENY;
 
-		virtual Version GetVersion()
+		if (adding)
 		{
-			return Version(1,0,0,3,VF_STATIC);
+			if (!channel->IsModeSet('W'))
+			{
+				dest->SetMode('W',true);
+				return MODEACTION_ALLOW;
+			}
 		}
-
-		virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list& params)
+		else
 		{
-			if((type == MT_CLIENT) && (modechar == 'W'))
+			if (channel->IsModeSet('W'))
 			{
-				return 1;
+				dest->SetMode('W',false);
+				return MODEACTION_ALLOW;
 			}
-
-			return 0;
 		}
 
-		virtual void OnWhois(userrec* source, userrec* dest)
+		return MODEACTION_DENY;
+	}
+};
+
+class ModuleShowwhois : public Module
+{
+	
+	SeeWhois* sw;
+
+ public:
+
+	ModuleShowwhois(InspIRCd* Me) : Module::Module(Me)
+	{
+		
+		sw = new SeeWhois(ServerInstance);
+		ServerInstance->AddMode(sw, 'W');
+	}
+
+	~ModuleShowwhois()
+	{
+		DELETE(sw);
+	}
+
+	void Implements(char* List)
+	{
+		List[I_OnWhois] = 1;
+	}
+
+	virtual Version GetVersion()
+	{
+		return Version(1,0,0,3,VF_STATIC);
+	}
+
+	virtual void OnWhois(userrec* source, userrec* dest)
+	{
+		if ((dest->IsModeSet('W')) && (source != dest))
 		{
-			if(strchr(dest->modes,'W'))
-			{
-				WriteServ(dest->fd,"NOTICE %s :*** %s (%s@%s) did a /whois on you.",dest->nick,source->nick,source->ident,source->host);
-			}
+			dest->WriteServ("NOTICE %s :*** %s (%s@%s) did a /whois on you.",dest->nick,source->nick,source->ident,source->host);
 		}
+	}
 
 };
 
@@ -66,7 +95,7 @@ class ModuleShowwhoisFactory : public ModuleFactory
 		{
 		}
 
-		virtual Module* CreateModule(Server* Me)
+		virtual Module* CreateModule(InspIRCd* Me)
 		{
 			return new ModuleShowwhois(Me);
 		}