X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_knock.cpp;h=4c29fe6bc4101e1a737fbe8bd07c1bc033be7a4c;hb=48033e9b3a708f265c0bc2d62460a6cefa70dd45;hp=97eb0e005d2b8512ba24076c27b7a4db4d9af5e3;hpb=cff57f7ba780a5c4fc331ccbab489abdc572379c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_knock.cpp b/src/modules/m_knock.cpp
index 97eb0e005..4c29fe6bc 100644
--- a/src/modules/m_knock.cpp
+++ b/src/modules/m_knock.cpp
@@ -70,7 +70,7 @@ class CommandKnock : public Command
 		if (sendnumeric)
 			c->WriteChannelWithServ(ServerInstance->Config->ServerName, "710 %s %s %s :is KNOCKing: %s", c->name.c_str(), c->name.c_str(), user->GetFullHost().c_str(), parameters[1].c_str());
 
-		user->WriteServ("NOTICE %s :KNOCKing on %s", user->nick.c_str(), c->name.c_str());
+		user->WriteNotice("KNOCKing on " + c->name);
 		return CMD_SUCCESS;
 	}
 
@@ -95,15 +95,18 @@ class ModuleKnock : public Module
  public:
 	ModuleKnock() : cmd(this), kn(this)
 	{
-		if (!ServerInstance->Modes->AddMode(&kn))
-			throw ModuleException("Could not add new modes!");
-		ServerInstance->AddCommand(&cmd);
+	}
+
+	void init() CXX11_OVERRIDE
+	{
+		ServerInstance->Modules->AddService(kn);
+		ServerInstance->Modules->AddService(cmd);
 
 		ServerInstance->Modules->Attach(I_OnRehash, this);
 		OnRehash(NULL);
 	}
 
-	void OnRehash(User* user)
+	void OnRehash(User* user) CXX11_OVERRIDE
 	{
 		std::string knocknotify = ServerInstance->Config->ConfValue("knock")->getString("notify");
 		irc::string notify(knocknotify.c_str());
@@ -125,7 +128,7 @@ class ModuleKnock : public Module
 		}
 	}
 
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Provides support for /KNOCK and channel mode +K", VF_OPTCOMMON | VF_VENDOR);
 	}