X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_showwhois.cpp;h=8532b14eb62d2bf7a7acafe32d0fcf9da9bea0a2;hb=e59cb85871f75b7603c63c6cd274d57536cf6794;hp=99887952cf69604a2bdc4bc650ced9d570ebbbb5;hpb=e4acbc95b8b6cd5b28d38a2242c02e8ff4991e4a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_showwhois.cpp b/src/modules/m_showwhois.cpp
index 99887952c..8532b14eb 100644
--- a/src/modules/m_showwhois.cpp
+++ b/src/modules/m_showwhois.cpp
@@ -1,104 +1,125 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   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 program is free but copyrighted software; see
- *            the file COPYING for details.
+ * 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"
 
-/* $ModDesc: Allows opers to set +W to see when a user uses WHOIS on them */
+#include "inspircd.h"
+#include "modules/whois.h"
 
 /** Handle user mode +W
  */
-class SeeWhois : public ModeHandler
+class SeeWhois : public SimpleUserModeHandler
 {
  public:
-	SeeWhois(InspIRCd* Instance) : ModeHandler(Instance, 'W', 0, 0, false, MODETYPE_USER, true) { }
+	SeeWhois(Module* Creator)
+		: SimpleUserModeHandler(Creator, "showwhois", 'W')
+	{
+	}
 
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
+	void SetOperOnly(bool operonly)
 	{
-		/* Only opers can change other users modes */
-		if (source != dest)
-			return MODEACTION_DENY;
+		oper = operonly;
+	}
+};
 
-		if (adding)
-		{
-			if (!dest->IsModeSet('W'))
-			{
-				dest->SetMode('W',true);
-				return MODEACTION_ALLOW;
-			}
-		}
-		else
-		{
-			if (dest->IsModeSet('W'))
-			{
-				dest->SetMode('W',false);
-				return MODEACTION_ALLOW;
-			}
-		}
+class WhoisNoticeCmd : public Command
+{
+ public:
+	WhoisNoticeCmd(Module* Creator) : Command(Creator,"WHOISNOTICE", 2)
+	{
+		flags_needed = FLAG_SERVERONLY;
+	}
 
-		return MODEACTION_DENY;
+	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;
 	}
 };
 
-class ModuleShowwhois : public Module
+class ModuleShowwhois : public Module, public Whois::EventListener
 {
-	
-	SeeWhois* sw;
+	bool ShowWhoisFromOpers;
+	SeeWhois sw;
+	WhoisNoticeCmd cmd;
 
  public:
 
-	ModuleShowwhois(InspIRCd* Me) : Module(Me)
+	ModuleShowwhois()
+		: Whois::EventListener(this)
+		, sw(this)
+		, cmd(this)
 	{
-		
-		sw = new SeeWhois(ServerInstance);
-		if (!ServerInstance->AddMode(sw))
-			throw ModuleException("Could not add new modes!");
-		Implementation eventlist[] = { I_OnWhois };
-		ServerInstance->Modules->Attach(eventlist, this, 1);
 	}
 
-	~ModuleShowwhois()
+	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
-		ServerInstance->Modes->DelMode(sw);
-		delete sw;
-	}
+		ConfigTag* tag = ServerInstance->Config->ConfValue("showwhois");
 
+		sw.SetOperOnly(tag->getBool("opersonly", true));
+		ShowWhoisFromOpers = tag->getBool("showfromopers", true);
+	}
 
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version(1,1,0,3,VF_COMMON|VF_VENDOR,API_VERSION);
+		return Version("Provides user mode +W for opers to see when a user uses WHOIS on them", VF_OPTCOMMON|VF_VENDOR);
 	}
 
-	virtual void OnWhois(User* source, User* dest)
+	void OnWhois(Whois::Context& whois) CXX11_OVERRIDE
 	{
-		if ((dest->IsModeSet('W')) && (source != dest))
+		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))
 		{
-			if (IS_LOCAL(dest))
-			{
-				dest->WriteServ("NOTICE %s :*** %s (%s@%s) did a /whois on you.",dest->nick,source->nick,source->ident,source->host);
-			}
-			else
-			{
-				std::deque<std::string> params;
-				params.push_back(dest->nick);
-				std::string msg = ":";
-				msg = msg + dest->server + " NOTICE " + dest->nick + " :*** " + source->nick + " (" + source->ident + "@" + source->host + ") did a /whois on you.";
-				params.push_back(msg);
-				Event ev((char *) &params, NULL, "send_push");
-				ev.Send(ServerInstance);
-			}
+			cmd.HandleFast(dest, source);
+		}
+		else
+		{
+			CommandBase::Params params;
+			params.push_back(dest->uuid);
+			params.push_back(source->uuid);
+			ServerInstance->PI->SendEncapsulatedData(dest->server->GetName(), cmd.name, params);
 		}
 	}
-
 };
 
 MODULE_INIT(ModuleShowwhois)