X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_showwhois.cpp;h=18fbd3144b0aa61c8ea1499cb47b5314fdd10cf3;hb=7ba36f5348a6cca1c0da820c60ae17063f3cdad5;hp=519b1335285692786ef32acd524de5db5290a6ba;hpb=33ed72a1dfae595132dd50c760b6a312ef2ce8fe;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_showwhois.cpp b/src/modules/m_showwhois.cpp
index 519b13352..18fbd3144 100644
--- a/src/modules/m_showwhois.cpp
+++ b/src/modules/m_showwhois.cpp
@@ -1,80 +1,127 @@
-using namespace std;
-
-// showwhois module by typobox43
-// Modified by Craig
-
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "helperfuncs.h"
-
-/* $ModDesc: Allows opers to set +W to see when a user uses WHOIS on them */
-
-class ModuleShowwhois : public Module
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   Copyright (C) 2013, 2017-2018 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012-2015 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2010 Craig Edwards <brain@inspircd.org>
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include "inspircd.h"
+#include "modules/whois.h"
+
+/** Handle user mode +W
+ */
+class SeeWhois : public SimpleUserModeHandler
 {
-		Server* Srv;
-
-	public:
-		ModuleShowwhois(Server* Me)
-			: Module::Module(Me)
-		{
-			Srv = Me;
-			Srv->AddExtendedMode('W',MT_CLIENT,true,0,0);
-		}
-
-		~ModuleShowwhois()
-		{
-		}
-
-		void Implements(char* List)
-		{
-			List[I_OnWhois] = List[I_OnExtendedMode] = 1;
-		}
-
-		virtual Version GetVersion()
-		{
-			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;
-			}
-
-			return 0;
-		}
-
-		virtual void OnWhois(userrec* source, userrec* dest)
-		{
-			if ((dest->modes['W'-65]) && (source != dest))
-			{
-				WriteServ(dest->fd,"NOTICE %s :*** %s (%s@%s) did a /whois on you.",dest->nick,source->nick,source->ident,source->host);
-			}
-		}
-
+ public:
+	SeeWhois(Module* Creator)
+		: SimpleUserModeHandler(Creator, "showwhois", 'W')
+	{
+	}
+
+	void SetOperOnly(bool operonly)
+	{
+		oper = operonly;
+	}
 };
 
-class ModuleShowwhoisFactory : public ModuleFactory
+class WhoisNoticeCmd : public Command
 {
-	public:
-		ModuleShowwhoisFactory()
-		{
-		}
+ public:
+	WhoisNoticeCmd(Module* Creator) : Command(Creator,"WHOISNOTICE", 2)
+	{
+		flags_needed = FLAG_SERVERONLY;
+	}
+
+	void HandleFast(User* dest, User* src)
+	{
+		dest->WriteNotice("*** " + src->nick + " (" + src->ident + "@" +
+			src->GetHost(dest->HasPrivPermission("users/auspex")) +
+			") did a /whois on you");
+	}
+
+	CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
+	{
+		User* dest = ServerInstance->FindNick(parameters[0]);
+		if (!dest)
+			return CMD_FAILURE;
+
+		User* source = ServerInstance->FindNick(parameters[1]);
+
+		if (IS_LOCAL(dest) && source)
+			HandleFast(dest, source);
+
+		return CMD_SUCCESS;
+	}
+};
 
-		~ModuleShowwhoisFactory()
+class ModuleShowwhois : public Module, public Whois::EventListener
+{
+	bool ShowWhoisFromOpers;
+	SeeWhois sw;
+	WhoisNoticeCmd cmd;
+
+ public:
+
+	ModuleShowwhois()
+		: Whois::EventListener(this)
+		, sw(this)
+		, cmd(this)
+	{
+	}
+
+	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
+	{
+		ConfigTag* tag = ServerInstance->Config->ConfValue("showwhois");
+
+		sw.SetOperOnly(tag->getBool("opersonly", true));
+		ShowWhoisFromOpers = tag->getBool("showfromopers", true);
+	}
+
+	Version GetVersion() CXX11_OVERRIDE
+	{
+		return Version("Adds user mode W (showwhois) which allows users to be informed when someone does a /WHOIS query on their nick.", VF_OPTCOMMON|VF_VENDOR);
+	}
+
+	void OnWhois(Whois::Context& whois) CXX11_OVERRIDE
+	{
+		User* const source = whois.GetSource();
+		User* const dest = whois.GetTarget();
+		if (!dest->IsModeSet(sw) || whois.IsSelfWhois())
+			return;
+
+		if (!ShowWhoisFromOpers && source->IsOper())
+			return;
+
+		if (IS_LOCAL(dest))
 		{
+			cmd.HandleFast(dest, source);
 		}
-
-		virtual Module* CreateModule(Server* Me)
+		else
 		{
-			return new ModuleShowwhois(Me);
+			CommandBase::Params params;
+			params.push_back(dest->uuid);
+			params.push_back(source->uuid);
+			ServerInstance->PI->SendEncapsulatedData(dest->server->GetName(), cmd.name, params);
 		}
-
+	}
 };
 
-extern "C" void* init_module()
-{
-	return new ModuleShowwhoisFactory;
-}
+MODULE_INIT(ModuleShowwhois)