Some more text fixes and improvements (#1618).

[user/henk/code/inspircd.git] / src / modules / m_regex_glob.cpp

diff --git a/src/modules/m_regex_glob.cpp b/src/modules/m_regex_glob.cpp
index ef843cc767e07e0ff30150b2fda9c56d852196be..f4dccac20a5b3f25d57e8a05499331487a6db320 100644 (file)
--- a/src/modules/m_regex_glob.cpp
+++ b/src/modules/m_regex_glob.cpp
@@ -1,21 +1,25 @@
-/*       +------------------------------------+
- *       | 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 "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
 {
@@ -24,49 +28,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);
-               Implementation eventlist[] = { I_OnRequest };
-               ServerInstance->Modules->Attach(eventlist, this, 1);
-       }
-
-       virtual Version GetVersion()
-       {
-               return Version("Regex module using plain wildcard matching.", 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 = new GlobRegex(rx);
-                       return "OK";
-               }
-               return NULL;
+               return Version("Regex provider module using plain wildcard matching", VF_VENDOR);
        }
 };