X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_regex_glob.cpp;h=3f0b5ac1139787d5a453a5d7be0954d2c6fd81d1;hb=a30a0074edac353cb60e134b43fa8ff0ffb67f8b;hp=a3923205f9321771683372beb739d9282dc79759;hpb=7e843c22e16c81054bad18073d24fe1a07026431;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_regex_glob.cpp b/src/modules/m_regex_glob.cpp
index a3923205f..3f0b5ac11 100644
--- a/src/modules/m_regex_glob.cpp
+++ b/src/modules/m_regex_glob.cpp
@@ -1,20 +1,30 @@
-/*       +------------------------------------+
- *       | 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) 2013 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
+ *   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
+ *   Copyright (C) 2008 Craig Edwards <brain@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. */
+#include "modules/regex.h"
+#include "inspircd.h"
 
 class GlobRegex : public Regex
 {
@@ -23,45 +33,35 @@ public:
 	{
 	}
 
-	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(text, this->regex_string);
+		return new GlobRegex(expr);
 	}
+
+	GlobFactory(Module* m) : RegexFactory(m, "regex/glob") {}
 };
 
 class ModuleRegexGlob : public Module
 {
+	GlobFactory gf;
 public:
-	ModuleRegexGlob() 	{
-		ServerInstance->Modules->PublishInterface("RegularExpression", this);
-	}
-
-	virtual Version GetVersion()
-	{
-		return Version("Regex module using plain wildcard matching.", VF_OPTCOMMON | VF_VENDOR | VF_SERVICEPROVIDER);
-	}
-
-	virtual ~ModuleRegexGlob()
+	ModuleRegexGlob()
+		: gf(this)
 	{
-		ServerInstance->Modules->UnpublishInterface("RegularExpression", this);
 	}
 
-	void OnRequest(Request& request)
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		if (strcmp("REGEX-NAME", request.id) == 0)
-		{
-			static_cast<RegexNameRequest&>(request).result = "glob";
-		}
-		else if (strcmp("REGEX", request.id) == 0)
-		{
-			RegexFactoryRequest& rfr = (RegexFactoryRequest&)request;
-			std::string rx = rfr.GetRegex();
-			rfr.result = new GlobRegex(rx);
-		}
+		return Version("Provides a regular expression engine which uses the built-in glob matching system.", VF_VENDOR);
 	}
 };