X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_rline.cpp;h=0df36eb37e8f4e45609b1f0320cb24083a712c79;hb=9ebd9cba72056c5b36696e166826afb981f25ebb;hp=9d9ed40dd0a739c01b1a58d608b9d02b40701921;hpb=cd712c40e1b352c05e7ae0f72e0a5e84cdf64323;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_rline.cpp b/src/modules/m_rline.cpp
index 9d9ed40dd..0df36eb37 100644
--- a/src/modules/m_rline.cpp
+++ b/src/modules/m_rline.cpp
@@ -201,10 +201,13 @@ class ModuleRLine : public Module
 	RLineFactory f;
 	CommandRLine r;
 	bool MatchOnNickChange;
-	std::string RegexEngine;
 
  public:
 	ModuleRLine() : rxfactory(this, "regex"), f(rxfactory), r(this, f)
+	{
+	}
+
+	void init()
 	{
 		OnRehash(NULL);
 
@@ -223,7 +226,7 @@ class ModuleRLine : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("RLINE: Regexp user banning.", VF_COMMON | VF_VENDOR);
+		return Version("RLINE: Regexp user banning.", VF_COMMON | VF_VENDOR, rxfactory ? rxfactory->name : "");
 	}
 
 	virtual void OnUserConnect(LocalUser* user)
@@ -249,10 +252,13 @@ class ModuleRLine : public Module
 		ZlineOnMatch = Conf.ReadFlag("rline", "zlineonmatch", 0);
 		std::string newrxengine = Conf.ReadValue("rline", "engine", 0);
 
-		rxfactory.SetProvider("regex/" + newrxengine);
+		if (newrxengine.empty())
+			rxfactory.SetProvider("regex");
+		else
+			rxfactory.SetProvider("regex/" + newrxengine);
 		if (!rxfactory)
 		{
-			ServerInstance->SNO->WriteToSnoMask('a', "WARNING: Regex engine '%s' is not loaded - R-Line functionality disabled until this is corrected.", RegexEngine.c_str());
+			ServerInstance->SNO->WriteToSnoMask('a', "WARNING: Regex engine '%s' is not loaded - R-Line functionality disabled until this is corrected.", newrxengine.c_str());
 		}
 	}