X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_showwhois.cpp;h=bf3028c122e233febc6664b1a6596bd45ee57625;hb=e950f568d0f571e9475aa38177486468714de4d3;hp=c16135679e9c667dd041600496e8f6543a1a6f33;hpb=2d821f2980825be73e3f90b47ffff365b0ec5ecb;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_showwhois.cpp b/src/modules/m_showwhois.cpp
index c16135679..bf3028c12 100644
--- a/src/modules/m_showwhois.cpp
+++ b/src/modules/m_showwhois.cpp
@@ -1,74 +1,127 @@
-using namespace std;
-
-// showwhois module by typobox43
-
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "helperfuncs.h"
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2005, 2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2004 Christopher Hall <typobox43@gmail.com>
+ *
+ * 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"
+
+/** Handle user mode +W
+ */
+class SeeWhois : public SimpleUserModeHandler
+{
+ public:
+	SeeWhois(Module* Creator, bool IsOpersOnly) : SimpleUserModeHandler(Creator, "showwhois", 'W')
+	{
+		oper = IsOpersOnly;
+	}
+};
 
-/* $ModDesc: Allows opers to set +W to see when a user uses WHOIS on them */
+class WhoisNoticeCmd : public Command
+{
+ public:
+	WhoisNoticeCmd(Module* Creator) : Command(Creator,"WHOISNOTICE", 1)
+	{
+		flags_needed = FLAG_SERVERONLY;
+	}
+
+	void HandleFast(User* dest, User* src)
+	{
+		dest->WriteNotice("*** " + src->nick + " (" + src->ident + "@" +
+			(dest->HasPrivPermission("users/auspex") ? src->host : src->dhost) +
+			") did a /whois on you");
+	}
+
+	CmdResult Handle(const std::vector<std::string> &parameters, User *user)
+	{
+		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;
+	}
+};
 
 class ModuleShowwhois : public Module
 {
-		Server* Srv;
+	bool ShowWhoisFromOpers;
+	SeeWhois* sw;
+	WhoisNoticeCmd cmd;
 
-	public:
-		ModuleShowwhois(Server* Me)
-			: Module::Module(Me)
-		{
-			Srv = Me;
-			Srv->AddExtendedMode('W',MT_CLIENT,true,0,0);
-		}
+ public:
 
-		~ModuleShowwhois()
-		{
-		}
+	ModuleShowwhois()
+		: sw(NULL), cmd(this)
+	{
+	}
 
-		virtual Version GetVersion()
-		{
-			return Version(1,0,0,3,VF_STATIC);
-		}
+	void init() CXX11_OVERRIDE
+	{
+		ConfigTag* tag = ServerInstance->Config->ConfValue("showwhois");
 
-		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;
-			}
+		bool OpersOnly = tag->getBool("opersonly", true);
+		ShowWhoisFromOpers = tag->getBool("showfromopers", true);
 
-			return 0;
-		}
+		sw = new SeeWhois(this, OpersOnly);
+		ServerInstance->Modules->AddService(*sw);
+		ServerInstance->Modules->AddService(cmd);
+	}
 
-		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);
-			}
-		}
+	~ModuleShowwhois()
+	{
+		delete sw;
+	}
 
-};
+	Version GetVersion() CXX11_OVERRIDE
+	{
+		return Version("Allows opers to set +W to see when a user uses WHOIS on them",VF_OPTCOMMON|VF_VENDOR);
+	}
 
-class ModuleShowwhoisFactory : public ModuleFactory
-{
-	public:
-		ModuleShowwhoisFactory()
-		{
-		}
+	void OnWhois(User* source, User* dest) CXX11_OVERRIDE
+	{
+		if (!dest->IsModeSet(*sw) || source == dest)
+			return;
+
+		if (!ShowWhoisFromOpers && source->IsOper())
+			return;
 
-		~ModuleShowwhoisFactory()
+		if (IS_LOCAL(dest))
 		{
+			cmd.HandleFast(dest, source);
 		}
-
-		virtual Module* CreateModule(Server* 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)
+