Merge branch 'master+sslconnmsg'

[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 f2a9004bd8325c0ad2a7a8ef158280337074324e..8a1d5424880d6d479ea9286494a2a0ec921f5433 100644 (file)
--- a/src/modules/extra/m_regex_tre.cpp
+++ b/src/modules/extra/m_regex_tre.cpp
@@ -1,38 +1,33 @@
-/*       +------------------------------------+
- *       | 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 "inspircd.h"
-#include "m_regex.h"
+#include "modules/regex.h"
 #include <sys/types.h>
 #include <tre/regex.h>
 
-/* $ModDesc: Regex Provider Module for TRE Regular Expressions */
 /* $CompileFlags: pkgconfincludes("tre","tre/regex.h","") */
 /* $LinkerFlags: pkgconflibs("tre","/libtre.so","-ltre") rpath("pkg-config --libs tre") */
-/* $ModDep: m_regex.h */
-
-class TRERegexException : public ModuleException
-{
-public:
-       TRERegexException(const std::string& rx, const std::string& error)
-               : ModuleException(std::string("Error in regex ") + rx + ": " + error)
-       {
-       }
-};
 
 class TRERegex : public Regex
 {
-private:
        regex_t regbuf;
 
 public:
@@ -53,55 +48,43 @@ public:
                        error = errbuf;
                        delete[] errbuf;
                        regfree(&regbuf);
-                       throw TRERegexException(rx, error);
+                       throw RegexException(rx, error);
                }
        }
 
-       virtual ~TRERegex()
+       ~TRERegex()
        {
                regfree(&regbuf);
        }
 
-       virtual bool Matches(const std::string& text)
+       bool Matches(const std::string& text)  CXX11_OVERRIDE
        {
-               if (regexec(&regbuf, text.c_str(), 0, NULL, 0) == 0)
-               {
-                       // Bang. :D
-                       return true;
-               }
-               return false;
+               return (regexec(&regbuf, text.c_str(), 0, NULL, 0) == 0);
        }
 };
 
-class ModuleRegexTRE : public Module
+class TREFactory : public RegexFactory
 {
-public:
-       ModuleRegexTRE()        {
-               ServerInstance->Modules->PublishInterface("RegularExpression", this);
-       }
-
-       virtual Version GetVersion()
+ public:
+       TREFactory(Module* m) : RegexFactory(m, "regex/tre") {}
+       Regex* Create(const std::string& expr) CXX11_OVERRIDE
        {
-               return Version("Regex Provider Module for TRE Regular Expressions", VF_COMMON | VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION);
+               return new TRERegex(expr);
        }
+};
 
-       virtual ~ModuleRegexTRE()
+class ModuleRegexTRE : public Module
+{
+       TREFactory trf;
+
+ public:
+       ModuleRegexTRE() : trf(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 = "tre";
-               }
-               else if (strcmp("REGEX", request.id) == 0)
-               {
-                       RegexFactoryRequest& rfr = (RegexFactoryRequest&)request;
-                       std::string rx = rfr.GetRegex();
-                       rfr.result = new TRERegex(rx);
-               }
+               return Version("Regex Provider Module for TRE Regular Expressions", VF_VENDOR);
        }
 };