X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_showwhois.cpp;h=ba17942cbbc32eb52871c4fe15b5e9c5fe437682;hb=acccaa39641500b8a691db4136e6571102a438ed;hp=691887429fd316b167f45ea5c0673908789b4922;hpb=fcacc8e0306382bc3f938073092c3729d77e2b41;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_showwhois.cpp b/src/modules/m_showwhois.cpp
index 691887429..ba17942cb 100644
--- a/src/modules/m_showwhois.cpp
+++ b/src/modules/m_showwhois.cpp
@@ -23,59 +23,43 @@
 
 #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(Module* Creator, bool IsOpersOnly) : ModeHandler(Creator, "showwhois", 'W', PARAM_NONE, MODETYPE_USER)
+	SeeWhois(Module* Creator)
+		: SimpleUserModeHandler(Creator, "showwhois", 'W')
 	{
-		oper = IsOpersOnly;
 	}
 
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
+	void SetOperOnly(bool 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;
-			}
-		}
-
-		return MODEACTION_DENY;
+		oper = operonly;
 	}
 };
 
 class WhoisNoticeCmd : public Command
 {
  public:
-	WhoisNoticeCmd(Module* Creator) : Command(Creator,"WHOISNOTICE", 1)
+	WhoisNoticeCmd(Module* Creator) : Command(Creator,"WHOISNOTICE", 2)
 	{
 		flags_needed = FLAG_SERVERONLY;
 	}
 
 	void HandleFast(User* dest, User* src)
 	{
-		dest->WriteServ("NOTICE %s :*** %s (%s@%s) did a /whois on you",
-			dest->nick.c_str(), src->nick.c_str(), src->ident.c_str(),
-			dest->HasPrivPermission("users/auspex") ? src->host.c_str() : src->dhost.c_str());
+		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)
@@ -88,41 +72,35 @@ class WhoisNoticeCmd : public Command
 class ModuleShowwhois : public Module
 {
 	bool ShowWhoisFromOpers;
-	SeeWhois* sw;
+	SeeWhois sw;
 	WhoisNoticeCmd cmd;
 
  public:
 
-	ModuleShowwhois() : cmd(this)
+	ModuleShowwhois()
+		: sw(this), cmd(this)
 	{
-		ConfigReader conf;
-		bool OpersOnly = conf.ReadFlag("showwhois", "opersonly", "yes", 0);
-		ShowWhoisFromOpers = conf.ReadFlag("showwhois", "showfromopers", "yes", 0);
-
-		sw = new SeeWhois(this, OpersOnly);
-		if (!ServerInstance->Modes->AddMode(sw))
-			throw ModuleException("Could not add new modes!");
-		ServerInstance->AddCommand(&cmd);
-		Implementation eventlist[] = { I_OnWhois };
-		ServerInstance->Modules->Attach(eventlist, this, 1);
 	}
 
-	~ModuleShowwhois()
+	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
-		delete sw;
+		ConfigTag* tag = ServerInstance->Config->ConfValue("showwhois");
+
+		sw.SetOperOnly(tag->getBool("opersonly", true));
+		ShowWhoisFromOpers = tag->getBool("showfromopers", true);
 	}
 
-	Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		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)
+	void OnWhois(User* source, User* dest) CXX11_OVERRIDE
 	{
-		if (!dest->IsModeSet('W') || source == dest)
+		if (!dest->IsModeSet(sw) || source == dest)
 			return;
 
-		if (!ShowWhoisFromOpers && IS_OPER(source))
+		if (!ShowWhoisFromOpers && source->IsOper())
 			return;
 
 		if (IS_LOCAL(dest))
@@ -132,14 +110,11 @@ class ModuleShowwhois : public Module
 		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);
+			ServerInstance->PI->SendEncapsulatedData(dest->server->GetName(), cmd.name, params);
 		}
 	}
-
 };
 
 MODULE_INIT(ModuleShowwhois)