Show a better warning when certtool/openssl are missing.

[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 d72d49896638a20026f358eca8ccc7b7562fece3..44d1a5898c7987091d72fd239b26248c1e02cf12 100644 (file)
--- 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)
        {
        }
 
@@ -34,40 +40,28 @@ public:
        }
 };
 
-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 Version GetVersion()
-       {
-               return Version("$Id$", VF_COMMON | VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION);
-       }
+       GlobFactory(Module* m) : RegexFactory(m, "regex/glob") {}
+};
 
-       virtual ~ModuleRegexGlob()
-       {
-               ServerInstance->Modules->UnpublishInterface("RegularExpression", this);
+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);
        }
 };