X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodmanager_dynamic.cpp;h=e613508df8d333f503ff1412cb41179d5838413c;hb=433044e8fc6ae601c0c5b8439494afee9f2e6be6;hp=05c9740632731a62b998b9d3c7c49d3d36ea2cd2;hpb=394414b7eb3eba8e1e7e429b6273c5a8f2e9dab9;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modmanager_dynamic.cpp b/src/modmanager_dynamic.cpp
index 05c974063..e613508df 100644
--- 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());
@@ -92,7 +68,8 @@ bool ModuleManager::Load(const std::string& filename, bool defer)
 			Modules[filename] = newmod;
 			if (defer)
 			{
-				ServerInstance->Logs->Log("MODULE", DEFAULT,"New module introduced: %s", filename.c_str());
+				ServerInstance->Logs->Log("MODULE", DEFAULT,"New module introduced: %s (Module version %s)",
+					filename.c_str(), newhandle->GetVersion().c_str());
 			}
 			else
 			{
@@ -251,6 +228,7 @@ void ModuleManager::LoadAll()
 		Module* mod = i->second;
 		try 
 		{
+			ServerInstance->Logs->Log("MODULE", DEBUG, "Initializing %s", i->first.c_str());
 			mod->init();
 		}
 		catch (CoreException& modexcept)
@@ -282,27 +260,4 @@ void ModuleManager::LoadAll()
 	}
 }
 
-void ModuleManager::UnloadAll()
-{
-	/* We do this more than once, so that any service providers get a
-	 * chance to be unhooked by the modules using them, but then get
-	 * a chance to be removed themsleves.
-	 *
-	 * Note: this deliberately does NOT delete the DLLManager objects
-	 */
-	for (int tries = 0; tries < 4; tries++)
-	{
-		std::map<std::string, Module*>::iterator i = Modules.begin();
-		while (i != Modules.end())
-		{
-			std::map<std::string, Module*>::iterator me = i++;
-			if (CanUnload(me->second))
-			{
-				DoSafeUnload(me->second);
-			}
-		}
-		ServerInstance->GlobalCulls.Apply();
-	}
-}
-
 #endif