X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_showwhois.cpp;h=9acc019aadc1cc62eeee8ed86ef6d3e29f8dc965;hb=7107ec12d8640d35cfe3d5002db1bc1deb33625d;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..9acc019aa 100644
--- a/src/modules/m_showwhois.cpp
+++ b/src/modules/m_showwhois.cpp
@@ -1,83 +1,133 @@
-// showwhois module by typobox43
-
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "helperfuncs.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 Version GetVersion()
+/** Handle user mode +W
+ */
+class SeeWhois : public ModeHandler
+{
+ public:
+	SeeWhois(Module* Creator, bool IsOpersOnly) : ModeHandler(Creator, 'W', PARAM_NONE, MODETYPE_USER)
+	{
+		oper = IsOpersOnly;
+	}
+
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
+	{
+		if (adding)
 		{
-			return Version(1,0,0,3,VF_STATIC);
-		}
-
-		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;
-
+			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() {
+class WhoisNoticeCmd : public Command
+{
+ public:
+	WhoisNoticeCmd(Module* Creator) : Command(Creator,"WHOISNOTICE", 1)
+	{
+	}
+
+	void HandleFast(User* dest, User* src)
+	{
+		dest->WriteServ("NOTICE %s :*** %s (%s@%s) did a /whois on you",
+			dest->nick.c_str(), src->nick.c_str(), src->ident.c_str(),
+			dest->HasPrivPermission("users/auspex") ? src->host.c_str() : src->dhost.c_str());
+	}
+
+	CmdResult Handle(const std::vector<std::string> &parameters, User *user)
+	{
+		User* dest = ServerInstance->FindNick(parameters[0]);
+
+		if (IS_LOCAL(dest))
+			HandleFast(dest, user);
+
+		return CMD_SUCCESS;
+	}
+};
 
+class ModuleShowwhois : public Module
+{
+	bool ShowWhoisFromOpers;
+	SeeWhois* sw;
+	WhoisNoticeCmd cmd;
+
+ public:
+
+	ModuleShowwhois() : cmd(this)
+	{
+		ConfigReader conf;
+		bool OpersOnly = conf.ReadFlag("showwhois", "opersonly", "yes", 0);
+		ShowWhoisFromOpers = conf.ReadFlag("showwhois", "showfromopers", "yes", 0);
+
+		sw = new SeeWhois(this, OpersOnly);
+		if (!ServerInstance->Modes->AddMode(sw))
+			throw ModuleException("Could not add new modes!");
+		ServerInstance->AddCommand(&cmd);
+		Implementation eventlist[] = { I_OnWhois };
+		ServerInstance->Modules->Attach(eventlist, this, 1);
+	}
+
+	~ModuleShowwhois()
+	{
+		ServerInstance->Modes->DelMode(sw);
+		delete sw;
+	}
+
+	virtual Version GetVersion()
+	{
+		return Version("Allows opers to set +W to see when a user uses WHOIS on them",VF_COMMON|VF_VENDOR,API_VERSION);
+	}
+
+	virtual void OnWhois(User* source, User* dest)
+	{
+		if (!dest->IsModeSet('W') || source == dest)
+			return;
+
+		if (!ShowWhoisFromOpers && (IS_OPER(source) != IS_OPER(dest)))
+			return;
+
+		if (IS_LOCAL(dest))
+		{
+			cmd.HandleFast(dest, source);
 		}
-
-		virtual Module* CreateModule() {
-
-			return new ModuleShowwhois;
-
+		else
+		{
+			std::vector<std::string> params;
+			params.push_back(dest->server);
+			params.push_back("WHOISNOTICE");
+			params.push_back(dest->uuid);
+			ServerInstance->PI->SendEncapsulatedData(params);
 		}
+	}
 
 };
 
-extern "C" void* init_module() {
-
-	return new ModuleShowwhoisFactory;
-
-}
+MODULE_INIT(ModuleShowwhois)