X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_showwhois.cpp;h=c8b4f6219fcc2eab2ec66bea320333bf02e580fb;hb=3cf993500544c2157992650da2487bfa89be405d;hp=227893ddf1ffd1b7a39df0f0e25448952320fe85;hpb=b7c7e603e986e1191f3763634bf1ca78901a5c28;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_showwhois.cpp b/src/modules/m_showwhois.cpp
index 227893ddf..c8b4f6219 100644
--- a/src/modules/m_showwhois.cpp
+++ b/src/modules/m_showwhois.cpp
@@ -1,11 +1,16 @@
-using namespace std;
-
-// showwhois module by typobox43
-// Modified by Craig
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 
 /* $ModDesc: Allows opers to set +W to see when a user uses WHOIS on them */
@@ -15,14 +20,13 @@ using namespace std;
 class SeeWhois : public ModeHandler
 {
  public:
-	SeeWhois(InspIRCd* Instance) : ModeHandler(Instance, 'W', 0, 0, false, MODETYPE_USER, true) { }
-
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	SeeWhois(Module* Creator, bool IsOpersOnly) : ModeHandler(Creator, "showwhois", 'W', PARAM_NONE, MODETYPE_USER)
 	{
-		/* Only opers can change other users modes */
-		if ((source != dest) && (!*source->oper))
-			return MODEACTION_DENY;
+		oper = IsOpersOnly;
+	}
 
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
+	{
 		if (adding)
 		{
 			if (!dest->IsModeSet('W'))
@@ -44,65 +48,88 @@ class SeeWhois : public ModeHandler
 	}
 };
 
-class ModuleShowwhois : public Module
+class WhoisNoticeCmd : public Command
 {
-	
-	SeeWhois* sw;
-
  public:
+	WhoisNoticeCmd(Module* Creator) : Command(Creator,"WHOISNOTICE", 1)
+	{
+		flags_needed = FLAG_SERVERONLY;
+	}
 
-	ModuleShowwhois(InspIRCd* Me) : Module::Module(Me)
+	void HandleFast(User* dest, User* src)
 	{
-		
-		sw = new SeeWhois(ServerInstance);
-		ServerInstance->AddMode(sw, 'W');
+		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());
 	}
 
-	~ModuleShowwhois()
+	CmdResult Handle(const std::vector<std::string> &parameters, User *user)
 	{
-		ServerInstance->Modes->DelMode(sw);
-		DELETE(sw);
+		User* dest = ServerInstance->FindNick(parameters[0]);
+		User* source = ServerInstance->FindNick(parameters[1]);
+
+		if (IS_LOCAL(dest) && source)
+			HandleFast(dest, source);
+
+		return CMD_SUCCESS;
 	}
+};
+
+class ModuleShowwhois : public Module
+{
+	bool ShowWhoisFromOpers;
+	SeeWhois* sw;
+	WhoisNoticeCmd cmd;
+
+ public:
 
-	void Implements(char* List)
+	ModuleShowwhois() : cmd(this)
 	{
-		List[I_OnWhois] = 1;
+		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);
 	}
 
-	virtual Version GetVersion()
+	~ModuleShowwhois()
 	{
-		return Version(1,1,0,3,VF_COMMON|VF_VENDOR,API_VERSION);
+		delete sw;
 	}
 
-	virtual void OnWhois(userrec* source, userrec* dest)
+	Version GetVersion()
 	{
-		if ((dest->IsModeSet('W')) && (source != dest))
-		{
-			dest->WriteServ("NOTICE %s :*** %s (%s@%s) did a /whois on you.",dest->nick,source->nick,source->ident,source->host);
-		}
+		return Version("Allows opers to set +W to see when a user uses WHOIS on them",VF_OPTCOMMON|VF_VENDOR);
 	}
 
-};
+	void OnWhois(User* source, User* dest)
+	{
+		if (!dest->IsModeSet('W') || source == dest)
+			return;
 
-class ModuleShowwhoisFactory : public ModuleFactory
-{
-	public:
-		ModuleShowwhoisFactory()
-		{
-		}
+		if (!ShowWhoisFromOpers && (!IS_OPER(source) != !IS_OPER(dest)))
+			return;
 
-		~ModuleShowwhoisFactory()
+		if (IS_LOCAL(dest))
 		{
+			cmd.HandleFast(dest, source);
 		}
-
-		virtual Module* CreateModule(InspIRCd* Me)
+		else
 		{
-			return new ModuleShowwhois(Me);
+			std::vector<std::string> params;
+			params.push_back(dest->server);
+			params.push_back("WHOISNOTICE");
+			params.push_back(dest->uuid);
+			params.push_back(source->uuid);
+			ServerInstance->PI->SendEncapsulatedData(params);
 		}
+	}
 
 };
 
-extern "C" void* init_module()
-{
-	return new ModuleShowwhoisFactory;
-}
+MODULE_INIT(ModuleShowwhois)