#include <dirent.h>
#endif
-#ifndef PURE_STATIC
+#ifndef INSPIRCD_STATIC
-bool ModuleManager::Load(const std::string& filename, bool defer)
+bool ModuleManager::Load(const std::string& modname, bool defer)
{
/* Don't allow people to specify paths for modules, it doesn't work as expected */
- if (filename.find('/') != std::string::npos)
+ if (modname.find('/') != std::string::npos)
{
- LastModuleError = "You can't load modules with a path: " + filename;
+ LastModuleError = "You can't load modules with a path: " + modname;
return false;
}
+ const std::string filename = ExpandModName(modname);
const std::string moduleFile = ServerInstance->Config->Paths.PrependModule(filename);
if (!FileSystem::FileExists(moduleFile))
newmod->dying = false;
Modules[filename] = newmod;
std::string version = newhandle->GetVersion();
+ if (version.empty())
+ version.assign("unknown");
if (defer)
{
ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, "New module introduced: %s (Module version %s)",