X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_regex_tre.cpp;h=4b9eab472266c0dece1e10e683979981bdd9865a;hb=a5d110282a864fd2e91b51ce360a977cd0643657;hp=f2a9004bd8325c0ad2a7a8ef158280337074324e;hpb=7e843c22e16c81054bad18073d24fe1a07026431;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/extra/m_regex_tre.cpp b/src/modules/extra/m_regex_tre.cpp
index f2a9004bd..4b9eab472 100644
--- a/src/modules/extra/m_regex_tre.cpp
+++ b/src/modules/extra/m_regex_tre.cpp
@@ -1,16 +1,23 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 #include "m_regex.h"
 #include <sys/types.h>
@@ -25,7 +32,7 @@ class TRERegexException : public ModuleException
 {
 public:
 	TRERegexException(const std::string& rx, const std::string& error)
-		: ModuleException(std::string("Error in regex ") + rx + ": " + error)
+		: ModuleException("Error in regex " + rx + ": " + error)
 	{
 	}
 };
@@ -73,35 +80,30 @@ public:
 	}
 };
 
+class TREFactory : public RegexFactory {
+ public:
+	TREFactory(Module* m) : RegexFactory(m, "regex/tre") {}
+	Regex* Create(const std::string& expr)
+	{
+		return new TRERegex(expr);
+	}
+};
+
 class ModuleRegexTRE : public Module
 {
+	TREFactory trf;
 public:
-	ModuleRegexTRE() 	{
-		ServerInstance->Modules->PublishInterface("RegularExpression", this);
+	ModuleRegexTRE() : trf(this) {
+		ServerInstance->Modules->AddService(trf);
 	}
 
-	virtual Version GetVersion()
+	Version GetVersion()
 	{
-		return Version("Regex Provider Module for TRE Regular Expressions", VF_COMMON | VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION);
+		return Version("Regex Provider Module for TRE Regular Expressions", VF_VENDOR);
 	}
 
-	virtual ~ModuleRegexTRE()
+	~ModuleRegexTRE()
 	{
-		ServerInstance->Modules->UnpublishInterface("RegularExpression", this);
-	}
-
-	void OnRequest(Request& request)
-	{
-		if (strcmp("REGEX-NAME", request.id) == 0)
-		{
-			static_cast<RegexNameRequest&>(request).result = "tre";
-		}
-		else if (strcmp("REGEX", request.id) == 0)
-		{
-			RegexFactoryRequest& rfr = (RegexFactoryRequest&)request;
-			std::string rx = rfr.GetRegex();
-			rfr.result = new TRERegex(rx);
-		}
 	}
 };