X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_showwhois.cpp;h=5291ae59561b359bc3343e9fac2c90a68eee5fe2;hb=fd1d19d6345943ecdb5ce4ef947f9b3c5c8bca86;hp=02ac49d2275e70379cdecb0de6cfab53251ba185;hpb=4e7c9f5a9257723765f9994aff90440a0b6cf3c9;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_showwhois.cpp b/src/modules/m_showwhois.cpp
index 02ac49d22..5291ae595 100644
--- a/src/modules/m_showwhois.cpp
+++ b/src/modules/m_showwhois.cpp
@@ -1,106 +1,129 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2007 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"
 
 /** 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, bool IsOpersOnly) : SimpleUserModeHandler(Creator, "showwhois", 'W')
+	{
+		oper = IsOpersOnly;
+	}
+};
 
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+class WhoisNoticeCmd : public Command
+{
+ public:
+	WhoisNoticeCmd(Module* Creator) : Command(Creator,"WHOISNOTICE", 1)
 	{
-		/* Only opers can change other users modes */
-		if (source != dest)
-			return MODEACTION_DENY;
+		flags_needed = FLAG_SERVERONLY;
+	}
 
-		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;
-			}
-		}
+	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");
+	}
 
-		return MODEACTION_DENY;
+	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
 {
-	
+	bool ShowWhoisFromOpers;
 	SeeWhois* sw;
+	WhoisNoticeCmd cmd;
 
  public:
 
-	ModuleShowwhois(InspIRCd* Me) : Module(Me)
+	ModuleShowwhois()
+		: sw(NULL), cmd(this)
 	{
-		
-		sw = new SeeWhois(ServerInstance);
-		if (!ServerInstance->AddMode(sw, 'W'))
-			throw ModuleException("Could not add new modes!");
 	}
 
-	~ModuleShowwhois()
+	void init() CXX11_OVERRIDE
 	{
-		ServerInstance->Modes->DelMode(sw);
-		DELETE(sw);
+		ConfigTag* tag = ServerInstance->Config->ConfValue("showwhois");
+
+		bool OpersOnly = tag->getBool("opersonly", true);
+		ShowWhoisFromOpers = tag->getBool("showfromopers", true);
+
+		sw = new SeeWhois(this, OpersOnly);
+		ServerInstance->Modules->AddService(*sw);
+		ServerInstance->Modules->AddService(cmd);
+		Implementation eventlist[] = { I_OnWhois };
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
-	void Implements(char* List)
+	~ModuleShowwhois()
 	{
-		List[I_OnWhois] = 1;
+		delete sw;
 	}
 
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version(1,1,0,3,VF_COMMON|VF_VENDOR,API_VERSION);
+		return Version("Allows opers to set +W to see when a user uses WHOIS on them",VF_OPTCOMMON|VF_VENDOR);
 	}
 
-	virtual void OnWhois(userrec* source, userrec* dest)
+	void OnWhois(User* source, User* dest) CXX11_OVERRIDE
 	{
-		if ((dest->IsModeSet('W')) && (source != dest))
+		if (!dest->IsModeSet(*sw) || source == dest)
+			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
+		{
+			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);
 		}
 	}
-
 };
 
 MODULE_INIT(ModuleShowwhois)
+