X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_swhois.cpp;h=c2659f6aa53909b7e28b175d84bf804de392f7f9;hb=e950f568d0f571e9475aa38177486468714de4d3;hp=a98c06c7509d8dedd3904a7ef994a21744abe130;hpb=2ab2de1dda8f2043898b9df8004ba5b6c4df7349;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_swhois.cpp b/src/modules/m_swhois.cpp
index a98c06c75..c2659f6aa 100644
--- a/src/modules/m_swhois.cpp
+++ b/src/modules/m_swhois.cpp
@@ -25,8 +25,6 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Provides the SWHOIS command which allows setting of arbitrary WHOIS lines */
-
 /** Handle /SWHOIS
  */
 class CommandSwhois : public Command
@@ -36,15 +34,14 @@ class CommandSwhois : public Command
 	CommandSwhois(Module* Creator) : Command(Creator,"SWHOIS", 2,2), swhois("swhois", Creator)
 	{
 		flags_needed = 'o'; syntax = "<nick> :<swhois>";
-		ServerInstance->Extensions.Register(&swhois);
-		TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
+		TRANSLATE2(TR_NICK, TR_TEXT);
 	}
 
 	CmdResult Handle(const std::vector<std::string> &parameters, User* user)
 	{
 		User* dest = ServerInstance->FindNick(parameters[0]);
 
-		if (!dest)
+		if ((!dest) || (IS_SERVER(dest))) // allow setting swhois using SWHOIS before reg
 		{
 			user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel", user->nick.c_str(), parameters[0].c_str());
 			return CMD_FAILURE;
@@ -89,13 +86,16 @@ class ModuleSWhois : public Module
  public:
 	ModuleSWhois() : cmd(this)
 	{
-		ServerInstance->AddCommand(&cmd);
-		Implementation eventlist[] = { I_OnWhoisLine, I_OnPostOper };
-		ServerInstance->Modules->Attach(eventlist, this, 2);
+	}
+
+	void init() CXX11_OVERRIDE
+	{
+		ServerInstance->Modules->AddService(cmd);
+		ServerInstance->Modules->AddService(cmd.swhois);
 	}
 
 	// :kenny.chatspike.net 320 Brain Azhrarn :is getting paid to play games.
-	ModResult OnWhoisLine(User* user, User* dest, int &numeric, std::string &text)
+	ModResult OnWhoisLine(User* user, User* dest, int &numeric, std::string &text) CXX11_OVERRIDE
 	{
 		/* We use this and not OnWhois because this triggers for remote, too */
 		if (numeric == 312)
@@ -112,7 +112,7 @@ class ModuleSWhois : public Module
 		return MOD_RES_PASSTHRU;
 	}
 
-	void OnPostOper(User* user, const std::string &opertype, const std::string &opername)
+	void OnPostOper(User* user, const std::string &opertype, const std::string &opername) CXX11_OVERRIDE
 	{
 		if (!IS_LOCAL(user))
 			return;
@@ -126,11 +126,7 @@ class ModuleSWhois : public Module
 		ServerInstance->PI->SendMetaData(user, "swhois", swhois);
 	}
 
-	~ModuleSWhois()
-	{
-	}
-
-	Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Provides the SWHOIS command which allows setting of arbitrary WHOIS lines", VF_OPTCOMMON | VF_VENDOR);
 	}