m_rline Fix memory leak when zlineonmatch was true and the zline existed, simplify...

[user/henk/code/inspircd.git] / src / modmanager_dynamic.cpp

diff --git a/src/modmanager_dynamic.cpp b/src/modmanager_dynamic.cpp
index 3845fd6da45e50b9679f73c4a743f461cce8792f..e613508df8d333f503ff1412cb41179d5838413c 100644 (file)
--- a/src/modmanager_dynamic.cpp
+++ b/src/modmanager_dynamic.cpp
@@ -1,16 +1,22 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@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 "xline.h"
 #include "socket.h"
@@ -30,36 +36,6 @@ bool ModuleManager::Load(const std::string& filename, bool defer)
        /* Don't allow people to specify paths for modules, it doesn't work as expected */
        if (filename.find('/') != std::string::npos)
                return false;
-       /* Do we have a glob pattern in the filename?
-        * The user wants to load multiple modules which
-        * match the pattern.
-        */
-       if (strchr(filename.c_str(),'*') || (strchr(filename.c_str(),'?')))
-       {
-               int n_match = 0;
-               DIR* library = opendir(ServerInstance->Config->ModPath.c_str());
-               if (library)
-               {
-                       /* Try and locate and load all modules matching the pattern */
-                       dirent* entry = NULL;
-                       while (0 != (entry = readdir(library)))
-                       {
-                               if (entry->d_name[0] == '.')
-                                       continue;
-                               if (InspIRCd::Match(entry->d_name, filename.c_str(), ascii_case_insensitive_map))
-                               {
-                                       if (!this->Load(entry->d_name, defer))
-                                               n_match++;
-                               }
-                       }
-                       closedir(library);
-               }
-               /* Loadmodule will now return false if any one of the modules failed
-                * to load (but wont abort when it encounters a bad one) and when 1 or
-                * more modules were actually loaded.
-                */
-               return (n_match > 0 ? false : true);
-       }
 
        char modfile[MAXBUF];
        snprintf(modfile,MAXBUF,"%s/%s",ServerInstance->Config->ModPath.c_str(),filename.c_str());