Merge pull request #1157 from SaberUK/insp20+fix-cron-restart

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

diff --git a/src/modules/extra/m_regex_tre.cpp b/src/modules/extra/m_regex_tre.cpp
index e0468d3c548f97f2870d8dae8c070bec7ddee445..4b9eab472266c0dece1e10e683979981bdd9865a 100644 (file)
--- 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-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 "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)
        {
        }
 };
@@ -36,7 +43,7 @@ private:
        regex_t regbuf;
 
 public:
-       TRERegex(const std::string& rx, InspIRCd* Me) : Regex(rx, Me)
+       TRERegex(const std::string& rx) : Regex(rx)
        {
                int flags = REG_EXTENDED | REG_NOSUB;
                int errcode;
@@ -73,40 +80,30 @@ public:
        }
 };
 
-class ModuleRegexTRE : public Module
-{
-public:
-       ModuleRegexTRE(InspIRCd* Me) : Module(Me)
+class TREFactory : public RegexFactory {
+ public:
+       TREFactory(Module* m) : RegexFactory(m, "regex/tre") {}
+       Regex* Create(const std::string& expr)
        {
-               Me->Modules->PublishInterface("RegularExpression", this);
-               Implementation eventlist[] = { I_OnRequest };
-               Me->Modules->Attach(eventlist, this, 1);
+               return new TRERegex(expr);
        }
+};
 
-       virtual Version GetVersion()
-       {
-               return Version("$Id: m_regex_tre.cpp 10291 2008-08-25 20:35:51Z w00t $", VF_COMMON | VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION);
+class ModuleRegexTRE : public Module
+{
+       TREFactory trf;
+public:
+       ModuleRegexTRE() : trf(this) {
+               ServerInstance->Modules->AddService(trf);
        }
 
-       virtual ~ModuleRegexTRE()
+       Version GetVersion()
        {
-               ServerInstance->Modules->UnpublishInterface("RegularExpression", this);
+               return Version("Regex Provider Module for TRE Regular Expressions", VF_VENDOR);
        }
 
-       virtual const char* OnRequest(Request* request)
+       ~ModuleRegexTRE()
        {
-               if (strcmp("REGEX-NAME", request->GetId()) == 0)
-               {
-                       return "tre";
-               }
-               else if (strcmp("REGEX", request->GetId()) == 0)
-               {
-                       RegexFactoryRequest* rfr = (RegexFactoryRequest*)request;
-                       std::string rx = rfr->GetRegex();
-                       rfr->result = new TRERegex(rx, ServerInstance);
-                       return "OK";
-               }
-               return NULL;
        }
 };