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

diff --git a/src/modules/m_showwhois.cpp b/src/modules/m_showwhois.cpp
index 6eec64bd5..5291ae595 100644
--- a/src/modules/m_showwhois.cpp
+++ b/src/modules/m_showwhois.cpp
@@ -23,39 +23,15 @@
 
 #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, bool IsOpersOnly) : SimpleUserModeHandler(Creator, "showwhois", 'W')
 	{
 		oper = IsOpersOnly;
 	}
-
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
-	{
-		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;
-	}
 };
 
 class WhoisNoticeCmd : public Command
@@ -68,9 +44,9 @@ class WhoisNoticeCmd : public Command
 
 	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)
@@ -96,18 +72,23 @@ class ModuleShowwhois : public Module
 
  public:
 
-	ModuleShowwhois() : cmd(this)
+	ModuleShowwhois()
+		: sw(NULL), cmd(this)
+	{
+	}
+
+	void init() CXX11_OVERRIDE
 	{
-		ConfigReader conf;
-		bool OpersOnly = conf.ReadFlag("showwhois", "opersonly", "yes", 0);
-		ShowWhoisFromOpers = conf.ReadFlag("showwhois", "showfromopers", "yes", 0);
+		ConfigTag* tag = ServerInstance->Config->ConfValue("showwhois");
+
+		bool OpersOnly = tag->getBool("opersonly", true);
+		ShowWhoisFromOpers = tag->getBool("showfromopers", true);
 
 		sw = new SeeWhois(this, OpersOnly);
-		if (!ServerInstance->Modes->AddMode(sw))
-			throw ModuleException("Could not add new modes!");
-		ServerInstance->AddCommand(&cmd);
+		ServerInstance->Modules->AddService(*sw);
+		ServerInstance->Modules->AddService(cmd);
 		Implementation eventlist[] = { I_OnWhois };
-		ServerInstance->Modules->Attach(eventlist, this, 1);
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
 	~ModuleShowwhois()
@@ -115,17 +96,17 @@ class ModuleShowwhois : public Module
 		delete sw;
 	}
 
-	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))
@@ -142,7 +123,7 @@ class ModuleShowwhois : public Module
 			ServerInstance->PI->SendEncapsulatedData(params);
 		}
 	}
-
 };
 
 MODULE_INIT(ModuleShowwhois)
+