Specify regex engine in m_filter/m_rline CAPAB line instead of marking m_regex_* as VF_COMMON

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@12259 e03df62e-2008-0410-955e-edbf42e46eb7

7 files changed, 10 insertions, 7 deletions

diff --git a/src/modules/extra/m_regex_pcre.cpp b/src/modules/extra/m_regex_pcre.cpp
index eaa1fa89e..095513782 100644
--- a/src/modules/extra/m_regex_pcre.cpp
+++ b/src/modules/extra/m_regex_pcre.cpp
@@ -87,7 +87,7 @@ public:
 
 	Version GetVersion()
 	{
-		return Version("Regex Provider Module for PCRE", VF_OPTCOMMON | VF_VENDOR);
+		return Version("Regex Provider Module for PCRE", VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/extra/m_regex_posix.cpp b/src/modules/extra/m_regex_posix.cpp
index ecf066707..dc8af3c71 100644
--- a/src/modules/extra/m_regex_posix.cpp
+++ b/src/modules/extra/m_regex_posix.cpp
@@ -95,7 +95,7 @@ public:
 
 	Version GetVersion()
 	{
-		return Version("Regex Provider Module for POSIX Regular Expressions", VF_COMMON | VF_VENDOR);
+		return Version("Regex Provider Module for POSIX Regular Expressions", VF_VENDOR);
 	}
 
 	void OnRehash(User* u)
diff --git a/src/modules/extra/m_regex_tre.cpp b/src/modules/extra/m_regex_tre.cpp
index e0acfd845..db08306fc 100644
--- a/src/modules/extra/m_regex_tre.cpp
+++ b/src/modules/extra/m_regex_tre.cpp
@@ -92,7 +92,7 @@ public:
 
 	Version GetVersion()
 	{
-		return Version("Regex Provider Module for TRE Regular Expressions", VF_COMMON | VF_VENDOR);
+		return Version("Regex Provider Module for TRE Regular Expressions", VF_VENDOR);
 	}
 
 	~ModuleRegexTRE()
diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp
index 064b87c49..f3f58a073 100644
--- a/src/modules/m_filter.cpp
+++ b/src/modules/m_filter.cpp
@@ -453,7 +453,7 @@ void ModuleFilter::OnRehash(User* user)
 
 Version ModuleFilter::GetVersion()
 {
-	return Version("Text (spam) filtering", VF_VENDOR | VF_COMMON);
+	return Version("Text (spam) filtering", VF_VENDOR | VF_COMMON, RegexEngine);
 }
 
 
diff --git a/src/modules/m_regex_glob.cpp b/src/modules/m_regex_glob.cpp
index a3d1b32ec..57f15f731 100644
--- a/src/modules/m_regex_glob.cpp
+++ b/src/modules/m_regex_glob.cpp
@@ -54,7 +54,7 @@ public:
 
 	Version GetVersion()
 	{
-		return Version("Regex module using plain wildcard matching.", VF_OPTCOMMON | VF_VENDOR);
+		return Version("Regex module using plain wildcard matching.", VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_rline.cpp b/src/modules/m_rline.cpp
index 9d9ed40dd..4abfca5c1 100644
--- a/src/modules/m_rline.cpp
+++ b/src/modules/m_rline.cpp
@@ -223,7 +223,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, rxengine);
 	}
 
 	virtual void OnUserConnect(LocalUser* user)
diff --git a/src/modules/m_spanningtree/compat.cpp b/src/modules/m_spanningtree/compat.cpp
index 625a2611e..d74d6f848 100644
--- a/src/modules/m_spanningtree/compat.cpp
+++ b/src/modules/m_spanningtree/compat.cpp
@@ -26,7 +26,10 @@ static const char* const forge_common_1201[] = {
 	"m_saquit.so",
 	"m_setident.so",
 	"m_swhois.so",
-	"m_regex_pcre.so"
+	"m_regex_glob.so",
+	"m_regex_pcre.so",
+	"m_regex_posix.so",
+	"m_regex_tre.so"
 };
 
 static std::string wide_newline("\r\n");