Remove spanningtree override of /LUSERS

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

diff --git a/src/modules/extra/m_regex_pcre.cpp b/src/modules/extra/m_regex_pcre.cpp
index 50e18bd160a4536ff28c328eaa5148c72ae9e3e0..c286162e8e25808bb07f721377f8e82a25e1020b 100644 (file)
--- a/src/modules/extra/m_regex_pcre.cpp
+++ b/src/modules/extra/m_regex_pcre.cpp
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -39,14 +39,14 @@ private:
        pcre* regex;
 
 public:
-       PCRERegex(const std::string& rx, InspIRCd* Me) : Regex(rx, Me)
+       PCRERegex(const std::string& rx) : Regex(rx)
        {
                const char* error;
                int erroffset;
                regex = pcre_compile(rx.c_str(), 0, &error, &erroffset, NULL);
                if (!regex)
                {
-                       Me->Logs->Log("REGEX", DEBUG, "pcre_compile failed: /%s/ [%d] %s", rx.c_str(), erroffset, error);
+                       ServerInstance->Logs->Log("REGEX", DEBUG, "pcre_compile failed: /%s/ [%d] %s", rx.c_str(), erroffset, error);
                        throw PCREException(rx, error, erroffset);
                }
        }
@@ -67,40 +67,27 @@ public:
        }
 };
 
-class ModuleRegexPCRE : public Module
+class PCREFactory : public RegexFactory
 {
-public:
-       ModuleRegexPCRE(InspIRCd* Me) : Module(Me)
+ public:
+       PCREFactory(Module* m) : RegexFactory(m, "regex/pcre") {}
+       Regex* Create(const std::string& expr)
        {
-               Me->Modules->PublishInterface("RegularExpression", this);
-               Implementation eventlist[] = { I_OnRequest };
-               Me->Modules->Attach(eventlist, this, 1);
-       }
-
-       virtual Version GetVersion()
-       {
-               return Version("$Id$", VF_COMMON | VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION);
+               return new PCRERegex(expr);
        }
+};
 
-       virtual ~ModuleRegexPCRE()
-       {
-               ServerInstance->Modules->UnpublishInterface("RegularExpression", this);
+class ModuleRegexPCRE : public Module
+{
+public:
+       PCREFactory ref;
+       ModuleRegexPCRE() : ref(this) {
+               ServerInstance->Modules->AddService(ref);
        }
 
-       virtual const char* OnRequest(Request* request)
+       Version GetVersion()
        {
-               if (strcmp("REGEX-NAME", request->GetId()) == 0)
-               {
-                       return "pcre";
-               }
-               else if (strcmp("REGEX", request->GetId()) == 0)
-               {
-                       RegexFactoryRequest* rfr = (RegexFactoryRequest*)request;
-                       std::string rx = rfr->GetRegex();
-                       rfr->result = new PCRERegex(rx, ServerInstance);
-                       return "OK";
-               }
-               return NULL;
+               return Version("Regex Provider Module for PCRE", VF_OPTCOMMON | VF_VENDOR);
        }
 };