X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_rline.cpp;h=a234c02c66bd89a5abd6479d84caaae0af46b455;hb=e59bb59ea29e73bf66139e9d5eab6d1b572e308d;hp=41d2bb2743c6aa2cad191add33035d30fce1974e;hpb=dbab6211293d537a45384a9980beec3873956cc7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_rline.cpp b/src/modules/m_rline.cpp
index 41d2bb274..a234c02c6 100644
--- a/src/modules/m_rline.cpp
+++ b/src/modules/m_rline.cpp
@@ -210,6 +210,9 @@ class CommandRLine : public Command
 
 	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
 	{
+		if (IS_LOCAL(user))
+			return ROUTE_LOCALONLY; // spanningtree will send ADDLINE
+
 		return ROUTE_BROADCAST;
 	}
 };
@@ -231,11 +234,11 @@ class ModuleRLine : public Module
 	{
 		OnRehash(NULL);
 
-		ServerInstance->AddCommand(&r);
+		ServerInstance->Modules->AddService(r);
 		ServerInstance->XLines->RegisterFactory(&f);
 
 		Implementation eventlist[] = { I_OnUserConnect, I_OnRehash, I_OnUserPostNick, I_OnStats, I_OnBackgroundTimer };
-		ServerInstance->Modules->Attach(eventlist, this, 5);
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
 	virtual ~ModuleRLine()
@@ -263,11 +266,11 @@ class ModuleRLine : public Module
 
 	virtual void OnRehash(User *user)
 	{
-		ConfigReader Conf;
+		ConfigTag* tag = ServerInstance->Config->ConfValue("rline");
 
-		MatchOnNickChange = Conf.ReadFlag("rline", "matchonnickchange", 0);
-		ZlineOnMatch = Conf.ReadFlag("rline", "zlineonmatch", 0);
-		std::string newrxengine = Conf.ReadValue("rline", "engine", 0);
+		MatchOnNickChange = tag->getBool("matchonnickchange");
+		ZlineOnMatch = tag->getBool("zlineonmatch");
+		std::string newrxengine = tag->getString("engine");
 
 		if (newrxengine.empty())
 			rxfactory.SetProvider("regex");