X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_conn_waitpong.cpp;h=d9341c79f5feb67884161b8a312ad1ccfb2b25d3;hb=551d687ec6d7ce44be35fae0dd7345fe73c4f63a;hp=764246e8476658b3d3228505b244da1d7539820e;hpb=553a8da754c8cd308bad2008018849714e70f9b7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_conn_waitpong.cpp b/src/modules/m_conn_waitpong.cpp
index 764246e84..d9341c79f 100644
--- a/src/modules/m_conn_waitpong.cpp
+++ b/src/modules/m_conn_waitpong.cpp
@@ -35,26 +35,22 @@ class ModuleWaitPong : public Module
  public:
 	ModuleWaitPong()
 	 : ext("waitpong_pingstr", this)
+	{
+	}
+
+	void init()
 	{
 		ServerInstance->Modules->AddService(ext);
 		OnRehash(NULL);
 		Implementation eventlist[] = { I_OnUserRegister, I_OnCheckReady, I_OnPreCommand, I_OnRehash };
-		ServerInstance->Modules->Attach(eventlist, this, 4);
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
 	void OnRehash(User* user)
 	{
-		ConfigReader Conf;
-
-		sendsnotice = Conf.ReadFlag("waitpong", "sendsnotice", 0);
-
-		if(Conf.GetError() == CONF_VALUE_NOT_FOUND)
-			sendsnotice = true;
-
-		killonbadreply = Conf.ReadFlag("waitpong", "killonbadreply", 0);
-
-		if(Conf.GetError() == CONF_VALUE_NOT_FOUND)
-			killonbadreply = true;
+		ConfigTag* tag = ServerInstance->Config->ConfValue("waitpong");
+		sendsnotice = tag->getBool("sendsnotice", true);
+		killonbadreply = tag->getBool("killonbadreply", true);
 	}
 
 	ModResult OnUserRegister(LocalUser* user)
@@ -99,15 +95,10 @@ class ModuleWaitPong : public Module
 		return ext.get(user) ? MOD_RES_DENY : MOD_RES_PASSTHRU;
 	}
 
-	~ModuleWaitPong()
-	{
-	}
-
 	Version GetVersion()
 	{
 		return Version("Require pong prior to registration", VF_VENDOR);
 	}
-
 };
 
 MODULE_INIT(ModuleWaitPong)