X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_regex_glob.cpp;h=44d1a5898c7987091d72fd239b26248c1e02cf12;hb=9c5629085ae4914f9db514ca6fbd94e8d58c6f31;hp=7977c77f105c2555b44cf03b1885868efe76b043;hpb=b3cbd1a15354f593b1c891b870bf7f2f276f74d7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_regex_glob.cpp b/src/modules/m_regex_glob.cpp
index 7977c77f1..44d1a5898 100644
--- a/src/modules/m_regex_glob.cpp
+++ b/src/modules/m_regex_glob.cpp
@@ -1,26 +1,32 @@
-/*       +------------------------------------+
- *       | 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 */
 
 class GlobRegex : public Regex
 {
 public:
-	GlobRegex(const std::string& rx, InspIRCd* Me) : Regex(rx, Me)
+	GlobRegex(const std::string& rx) : Regex(rx)
 	{
 	}
 
@@ -30,38 +36,33 @@ public:
 
 	virtual bool Matches(const std::string& text)
 	{
-		return InspIRCd::Match(this->regex_string, text);
+		return InspIRCd::Match(text, this->regex_string);
 	}
 };
 
-class ModuleRegexGlob : public Module
+class GlobFactory : public RegexFactory
 {
-public:
-	ModuleRegexGlob(InspIRCd* Me) : Module(Me)
+ public:
+	Regex* Create(const std::string& expr)
 	{
-		Me->Modules->PublishInterface("RegularExpression", this);
-		Implementation eventlist[] = { I_OnRequest };
-		Me->Modules->Attach(eventlist, this, 1);
+		return new GlobRegex(expr);
 	}
 
-	virtual ~ModuleRegexGlob()
-	{
-		ServerInstance->Modules->UnpublishInterface("RegularExpression", this);
+	GlobFactory(Module* m) : RegexFactory(m, "regex/glob") {}
+};
+
+class ModuleRegexGlob : public Module
+{
+	GlobFactory gf;
+public:
+	ModuleRegexGlob() : gf(this) {
+		ServerInstance->Modules->AddService(gf);
 	}
 
-	virtual const char* OnRequest(Request* request)
+	Version GetVersion()
 	{
-		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 module using plain wildcard matching.", VF_VENDOR);
 	}
 };
+
+MODULE_INIT(ModuleRegexGlob)