X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cgiirc.cpp;h=cce2e785531ad3c38b6fd3283fdeb173a8712aa0;hb=4e24fb7c19cff866eda602349fbafce78b7e4c51;hp=08b8d3f1c4bd26110933815b8dd15fd56d6617a6;hpb=83db3dc06a44b50d8e25828e201a51edb4030d92;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_cgiirc.cpp b/src/modules/m_cgiirc.cpp
index 08b8d3f1c..cce2e7855 100644
--- a/src/modules/m_cgiirc.cpp
+++ b/src/modules/m_cgiirc.cpp
@@ -176,9 +176,9 @@ class ModuleCgiIRC : public Module
 	CommandWebirc cmd;
 	LocalIntExt waiting;
 
-	static void RecheckElineAndClass(LocalUser* user)
+	static void RecheckClass(LocalUser* user)
 	{
-		user->exempt = (ServerInstance->XLines->MatchesLine("E", user) != NULL);
+		user->MyClass = NULL;
 		user->SetClass();
 		user->CheckClass();
 	}
@@ -198,7 +198,7 @@ class ModuleCgiIRC : public Module
 		ChangeIP(user, newip);
 		user->host = user->dhost = user->GetIPString();
 		user->InvalidateCache();
-		RecheckElineAndClass(user);
+		RecheckClass(user);
 		// Don't create the resolver if the core couldn't put the user in a connect class or when dns is disabled
 		if (user->quitting || ServerInstance->Config->NoUserDns)
 			return;
@@ -207,8 +207,8 @@ class ModuleCgiIRC : public Module
 		{
 			bool cached;
 			CGIResolver* r = new CGIResolver(this, cmd.notify, newip, user, (was_pass ? "PASS" : "IDENT"), cached, waiting);
-			ServerInstance->AddResolver(r, cached);
 			waiting.set(user, waiting.get(user) + 1);
+			ServerInstance->AddResolver(r, cached);
 		}
 		catch (...)
 		{
@@ -225,15 +225,11 @@ public:
 	void init()
 	{
 		OnRehash(NULL);
-		ServerInstance->AddCommand(&cmd);
-		ServerInstance->Extensions.Register(&cmd.realhost);
-		ServerInstance->Extensions.Register(&cmd.realip);
-		ServerInstance->Extensions.Register(&cmd.webirc_hostname);
-		ServerInstance->Extensions.Register(&cmd.webirc_ip);
-		ServerInstance->Extensions.Register(&waiting);
+		ServiceProvider* providerlist[] = { &cmd, &cmd.realhost, &cmd.realip, &cmd.webirc_hostname, &cmd.webirc_ip, &waiting };
+		ServerInstance->Modules->AddServices(providerlist, sizeof(providerlist)/sizeof(ServiceProvider*));
 
 		Implementation eventlist[] = { I_OnRehash, I_OnUserRegister, I_OnCheckReady };
-		ServerInstance->Modules->Attach(eventlist, this, 3);
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
 	void OnRehash(User* user)
@@ -298,8 +294,9 @@ public:
 
 		std::string* webirc_hostname = cmd.webirc_hostname.get(user);
 		user->host = user->dhost = (webirc_hostname ? *webirc_hostname : user->GetIPString());
+		user->InvalidateCache();
 
-		RecheckElineAndClass(user);
+		RecheckClass(user);
 		if (user->quitting)
 			return MOD_RES_DENY;