X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_regex_glob.cpp;h=f4dccac20a5b3f25d57e8a05499331487a6db320;hb=e59cb85871f75b7603c63c6cd274d57536cf6794;hp=8990995cf7fd91da8f01fee87d30a33574410967;hpb=86ac9c800fbb4371b45d3cf599ee9d8d07a1e4ab;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_regex_glob.cpp b/src/modules/m_regex_glob.cpp
index 8990995cf..f4dccac20 100644
--- a/src/modules/m_regex_glob.cpp
+++ b/src/modules/m_regex_glob.cpp
@@ -1,73 +1,62 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/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 "m_regex.h"
-#include "inspircd.h"
 
-/* $ModDesc: Regex module using plain wildcard matching. */
-/* $ModDep: m_regex.h */
+#include "modules/regex.h"
+#include "inspircd.h"
 
 class GlobRegex : public Regex
 {
 public:
-	GlobRegex(const std::string& rx, InspIRCd* Me) : Regex(rx, Me)
+	GlobRegex(const std::string& rx) : Regex(rx)
 	{
 	}
 
-	virtual ~GlobRegex()
+	bool Matches(const std::string& text) CXX11_OVERRIDE
 	{
+		return InspIRCd::Match(text, this->regex_string);
 	}
+};
 
-	virtual bool Matches(const std::string& text)
+class GlobFactory : public RegexFactory
+{
+ public:
+	Regex* Create(const std::string& expr) CXX11_OVERRIDE
 	{
-		return InspIRCd::Match(this->regex_string, text);
+		return new GlobRegex(expr);
 	}
+
+	GlobFactory(Module* m) : RegexFactory(m, "regex/glob") {}
 };
 
 class ModuleRegexGlob : public Module
 {
+	GlobFactory gf;
 public:
-	ModuleRegexGlob(InspIRCd* Me) : Module(Me)
-	{
-		Me->Modules->PublishInterface("RegularExpression", this);
-		Implementation eventlist[] = { I_OnRequest };
-		Me->Modules->Attach(eventlist, this, 1);
-	}
-
-	virtual Version GetVersion()
-	{
-		return Version("$Id$", VF_COMMON | VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION);
-	}
-
-	virtual ~ModuleRegexGlob()
+	ModuleRegexGlob()
+		: gf(this)
 	{
-		ServerInstance->Modules->UnpublishInterface("RegularExpression", this);
 	}
 
-	virtual const char* OnRequest(Request* request)
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		if (strcmp("REGEX-NAME", request->GetId()) == 0)
-		{
-			return "glob";
-		}
-		else if (strcmp("REGEX", request->GetId()) == 0)
-		{
-			RegexFactoryRequest* rfr = (RegexFactoryRequest*)request;
-			std::string rx = rfr->GetRegex();
-			rfr->result = (Regex*)new GlobRegex(rx, ServerInstance);
-			return "OK";
-		}
-		return NULL;
+		return Version("Regex provider module using plain wildcard matching", VF_VENDOR);
 	}
 };