X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_showwhois.cpp;h=ba17942cbbc32eb52871c4fe15b5e9c5fe437682;hb=92cc388aebd55245b24aef5950afe845feffe9e2;hp=85a16bc930cc0e4fffd4c912573cd47da0dbd663;hpb=855f0d98e90a077f46b456e98ebb8a9b290488f6;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_showwhois.cpp b/src/modules/m_showwhois.cpp
index 85a16bc93..ba17942cb 100644
--- a/src/modules/m_showwhois.cpp
+++ b/src/modules/m_showwhois.cpp
@@ -1,108 +1,120 @@
-using namespace std;
+/*
+ * 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/>.
+ */
 
-// showwhois module by typobox43
-// Modified by Craig
 
-#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 */
-
 /** Handle user mode +W
  */
-class SeeWhois : public ModeHandler
+class SeeWhois : public SimpleUserModeHandler
 {
  public:
-	SeeWhois(InspIRCd* Instance) : ModeHandler(Instance, 'W', 0, 0, false, MODETYPE_CHANNEL, false) { }
-
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	SeeWhois(Module* Creator)
+		: SimpleUserModeHandler(Creator, "showwhois", 'W')
 	{
-		/* Only opers can change other users modes */
-		if ((source != dest) && (!*source->oper))
-			return MODEACTION_DENY;
-
-		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;
-			}
-		}
+	}
 
-		return MODEACTION_DENY;
+	void SetOperOnly(bool operonly)
+	{
+		oper = operonly;
 	}
 };
 
-class ModuleShowwhois : public Module
+class WhoisNoticeCmd : public Command
 {
-	
-	SeeWhois* sw;
-
  public:
+	WhoisNoticeCmd(Module* Creator) : Command(Creator,"WHOISNOTICE", 2)
+	{
+		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->WriteNotice("*** " + src->nick + " (" + src->ident + "@" +
+			(dest->HasPrivPermission("users/auspex") ? src->host : src->dhost) +
+			") did a /whois on you");
 	}
 
-	~ModuleShowwhois()
+	CmdResult Handle(const std::vector<std::string> &parameters, User *user)
 	{
-		ServerInstance->Modes->DelMode(sw);
-		DELETE(sw);
+		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;
 	}
+};
 
-	void Implements(char* List)
+class ModuleShowwhois : public Module
+{
+	bool ShowWhoisFromOpers;
+	SeeWhois sw;
+	WhoisNoticeCmd cmd;
+
+ public:
+
+	ModuleShowwhois()
+		: sw(this), cmd(this)
 	{
-		List[I_OnWhois] = 1;
 	}
 
-	virtual Version GetVersion()
+	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
-		return Version(1,0,0,3,VF_COMMON|VF_VENDOR,API_VERSION);
+		ConfigTag* tag = ServerInstance->Config->ConfValue("showwhois");
+
+		sw.SetOperOnly(tag->getBool("opersonly", true));
+		ShowWhoisFromOpers = tag->getBool("showfromopers", true);
 	}
 
-	virtual void OnWhois(userrec* source, userrec* dest)
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		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) CXX11_OVERRIDE
+	{
+		if (!dest->IsModeSet(sw) || source == dest)
+			return;
 
-class ModuleShowwhoisFactory : public ModuleFactory
-{
-	public:
-		ModuleShowwhoisFactory()
-		{
-		}
+		if (!ShowWhoisFromOpers && source->IsOper())
+			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->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)