X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_showwhois.cpp;h=04834634d278039320c97cefcff80d0bd7d66673;hb=fcafba14c5408360ec725ed1649ede75b7ae52c1;hp=4a019e20e723c93b64768019aaab8c6c04e31cd0;hpb=6a2a049d38203cf79b0132b4fcef1e6609e3929f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_showwhois.cpp b/src/modules/m_showwhois.cpp
index 4a019e20e..04834634d 100644
--- a/src/modules/m_showwhois.cpp
+++ b/src/modules/m_showwhois.cpp
@@ -1,77 +1,114 @@
-// showwhois module by typobox43
-
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  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.
+ *
+ * ---------------------------------------------------
+ */
+
+#include "inspircd.h"
 
 /* $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;
-
-		}
-
-		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;
-
+/** Handle user mode +W
+ */
+class SeeWhois : public ModeHandler
+{
+ public:
+	SeeWhois(InspIRCd* Instance, bool IsOpersOnly) : ModeHandler(Instance, 'W', 0, 0, false, MODETYPE_USER, IsOpersOnly) { }
+
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
+	{
+		if (adding)
+		{
+			if (!dest->IsModeSet('W'))
+			{
+				dest->SetMode('W',true);
+				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);
-				
+		else
+		{
+			if (dest->IsModeSet('W'))
+			{
+				dest->SetMode('W',false);
+				return MODEACTION_ALLOW;
 			}
-
 		}
 
+		return MODEACTION_DENY;
+	}
 };
 
-class ModuleShowwhoisFactory : public ModuleFactory {
-
-	public:
-
-		ModuleShowwhoisFactory() {
-
-		}
-
-		~ModuleShowwhoisFactory() {
-
-		}
-
-		virtual Module* CreateModule() {
+class ModuleShowwhois : public Module
+{
+	bool ShowWhoisFromOpers;
+	SeeWhois* sw;
+
+ public:
+
+	ModuleShowwhois(InspIRCd* Me) : Module(Me)
+	{
+		ConfigReader conf(ServerInstance);
+		bool OpersOnly = conf.ReadFlag("showwhois", "opersonly", "yes", 0);
+		ShowWhoisFromOpers = conf.ReadFlag("showwhois", "showfromopers", "yes", 0);
+
+		sw = new SeeWhois(ServerInstance, OpersOnly);
+		if (!ServerInstance->Modes->AddMode(sw))
+			throw ModuleException("Could not add new modes!");
+		Implementation eventlist[] = { I_OnWhois };
+		ServerInstance->Modules->Attach(eventlist, this, 1);
+	}
+
+	~ModuleShowwhois()
+	{
+		ServerInstance->Modes->DelMode(sw);
+		delete sw;
+	}
+
+	virtual Version GetVersion()
+	{
+		return Version("$Id$",VF_COMMON|VF_VENDOR,API_VERSION);
+	}
+
+	virtual void OnWhois(User* source, User* dest)
+	{
+		if ((dest->IsModeSet('W')) && (source != dest))
+		{
+			if (!ShowWhoisFromOpers && IS_OPER(source))
+				return;
+
+			std::string wmsg = "*** ";
+			wmsg += source->nick + " (" + source->ident + "@";
+
+			if (dest->HasPrivPermission("users/auspex"))
+			{
+				wmsg += source->host;
+			}
+			else
+			{
+				wmsg += source->dhost;
+			}
 
-			return new ModuleShowwhois;
+			wmsg += ") did a /whois on you";
 
+			if (IS_LOCAL(dest))
+			{
+				dest->WriteServ("NOTICE %s :%s", dest->nick.c_str(), wmsg.c_str());
+			}
+			else
+			{
+				std::string msg = std::string("::") + dest->server + " NOTICE " + dest->nick + " :" + wmsg;
+				ServerInstance->PI->PushToClient(dest, msg);
+			}
 		}
+	}
 
 };
 
-extern "C" void* init_module() {
-
-	return new ModuleShowwhoisFactory;
-
-}
+MODULE_INIT(ModuleShowwhois)