X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_passforward.cpp;h=7f3cb6421ff4dd668f7f998dae204917dfc33d30;hb=e950f568d0f571e9475aa38177486468714de4d3;hp=fb7bae234c2c48c288104d7423f67f252b09fdbf;hpb=9fc6f1eac580c9114e0f6ed83233683fb16a5e3f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_passforward.cpp b/src/modules/m_passforward.cpp
index fb7bae234..7f3cb6421 100644
--- a/src/modules/m_passforward.cpp
+++ b/src/modules/m_passforward.cpp
@@ -17,34 +17,29 @@
  */
 
 
-/* $ModDesc: Forwards a password users can send on connect (for example for NickServ identification). */
-
 #include "inspircd.h"
 
 class ModulePassForward : public Module
 {
- private:
 	std::string nickrequired, forwardmsg, forwardcmd;
 
  public:
-	ModulePassForward()
+	void init() CXX11_OVERRIDE
 	{
 		OnRehash(NULL);
-		Implementation eventlist[] = { I_OnPostConnect, I_OnRehash };
-		ServerInstance->Modules->Attach(eventlist, this, 2);
 	}
 
-	Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Sends server password to NickServ", VF_VENDOR);
 	}
 
-	void OnRehash(User* user)
+	void OnRehash(User* user) CXX11_OVERRIDE
 	{
-		ConfigReader Conf;
-		nickrequired = Conf.ReadValue("passforward", "nick", "NickServ", 0);
-		forwardmsg = Conf.ReadValue("passforward", "forwardmsg", "NOTICE $nick :*** Forwarding PASS to $nickrequired", 0);
-		forwardcmd = Conf.ReadValue("passforward", "cmd", "PRIVMSG $nickrequired :IDENTIFY $pass", 0);
+		ConfigTag* tag = ServerInstance->Config->ConfValue("passforward");
+		nickrequired = tag->getString("nick", "NickServ");
+		forwardmsg = tag->getString("forwardmsg", "NOTICE $nick :*** Forwarding PASS to $nickrequired");
+		forwardcmd = tag->getString("cmd", "PRIVMSG $nickrequired :IDENTIFY $pass");
 	}
 
 	void FormatStr(std::string& result, const std::string& format, const LocalUser* user)
@@ -82,7 +77,7 @@ class ModulePassForward : public Module
 		}
 	}
 
-	virtual void OnPostConnect(User* ruser)
+	void OnPostConnect(User* ruser) CXX11_OVERRIDE
 	{
 		LocalUser* user = IS_LOCAL(ruser);
 		if (!user || user->password.empty())
@@ -91,7 +86,7 @@ class ModulePassForward : public Module
 		if (!nickrequired.empty())
 		{
 			/* Check if nick exists and its server is ulined */
-			User* u = ServerInstance->FindNick(nickrequired.c_str());
+			User* u = ServerInstance->FindNick(nickrequired);
 			if (!u || !ServerInstance->ULine(u->server))
 				return;
 		}