X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_showwhois.cpp;h=c7ba52035b3dc3a0b0b21ba83e299db72b273a0b;hb=01c5bba74187def0a737a077bd1b999a55bac075;hp=6d3220658e5e00f748a171e9f8b70d3f79b13171;hpb=eb4229deed0281ae566ef7e55a144e5d3183a4b2;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_showwhois.cpp b/src/modules/m_showwhois.cpp
index 6d3220658..c7ba52035 100644
--- a/src/modules/m_showwhois.cpp
+++ b/src/modules/m_showwhois.cpp
@@ -1,4 +1,7 @@
+using namespace std;
+
 // showwhois module by typobox43
+// Modified by Craig
 
 #include "users.h"
 #include "channels.h"
@@ -7,77 +10,96 @@
 
 /* $ModDesc: Allows opers to set +W to see when a user uses WHOIS on them */
 
-Server *Srv;
-
-class ModuleShowwhois : public Module {
-
-	public:
-
-		ModuleShowwhois() {
-
-			Srv = new Server;
-
-			Srv->AddExtendedMode('W',MT_CLIENT,true,0,0);
-
-		}
-
-		~ModuleShowwhois() {
-
-			delete Srv;
+class SeeWhois : public ModeHandler
+{
+ public:
+	SeeWhois() : ModeHandler('W', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
-		}
+	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) {
-
-			if((type == MT_CLIENT) && (modechar == 'W')) {
-
-				return 1;
-
+		else
+		{
+			if (channel->IsModeSet('W'))
+			{
+				dest->SetMode('W',false);
+				return MODEACTION_ALLOW;
 			}
-
-			return 0;
-
 		}
 
-		virtual void OnWhois(userrec* source, userrec* 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);
-				
-			}
+		return MODEACTION_DENY;
+	}
+};
 
+class ModuleShowwhois : public Module
+{
+	Server* Srv;
+	SeeWhois* sw;
+
+ public:
+
+	ModuleShowwhois(Server* Me) : Module::Module(Me)
+	{
+		Srv = Me;
+		sw = new SeeWhois();
+		Srv->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))
+		{
+			WriteServ(dest->fd,"NOTICE %s :*** %s (%s@%s) did a /whois on you.",dest->nick,source->nick,source->ident,source->host);
 		}
+	}
 
 };
 
-class ModuleShowwhoisFactory : public ModuleFactory {
-
+class ModuleShowwhoisFactory : public ModuleFactory
+{
 	public:
-
-		ModuleShowwhoisFactory() {
-
+		ModuleShowwhoisFactory()
+		{
 		}
 
-		~ModuleShowwhoisFactory() {
-
+		~ModuleShowwhoisFactory()
+		{
 		}
 
-		virtual Module* CreateModule() {
-
-			return new ModuleShowwhois;
-
+		virtual Module* CreateModule(Server* Me)
+		{
+			return new ModuleShowwhois(Me);
 		}
 
 };
 
-extern "C" void* init_module() {
-
+extern "C" void* init_module()
+{
 	return new ModuleShowwhoisFactory;
-
 }