X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules.cpp;h=de2fe96b3c59d6489607033bc2d7632ea615f658;hb=b76ff64daeeb1e1081cff93c611f730e5b1b051e;hp=567aa917cdb9aab8140c8c3948325c2e4d48c36d;hpb=6c4a6b1753926f7de2cc210bf25d1b3c87c181e9;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules.cpp b/src/modules.cpp
index 567aa917c..de2fe96b3 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -126,7 +126,7 @@ void		Module::OnChangeIdent(User*, const std::string&) { DetachEvent(I_OnChangeI
 void		Module::OnAddLine(User*, XLine*) { DetachEvent(I_OnAddLine); }
 void		Module::OnDelLine(User*, XLine*) { DetachEvent(I_OnDelLine); }
 void		Module::OnExpireLine(XLine*) { DetachEvent(I_OnExpireLine); }
-void 		Module::OnCleanup(int, void*) { }
+void 		Module::OnCleanup(ExtensionItem::ExtensibleType, Extensible*) { }
 ModResult	Module::OnChannelPreDelete(Channel*) { DetachEvent(I_OnChannelPreDelete); return MOD_RES_PASSTHRU; }
 void		Module::OnChannelDelete(Channel*) { DetachEvent(I_OnChannelDelete); }
 ModResult	Module::OnSetAway(User*, const std::string &) { DetachEvent(I_OnSetAway); return MOD_RES_PASSTHRU; }
@@ -363,6 +363,10 @@ void ModuleManager::DoSafeUnload(Module* mod)
 
 	std::map<std::string, Module*>::iterator modfind = Modules.find(mod->ModuleSourceFile);
 
+	// Unregister modes before extensions because modes may require their extension to show the mode being unset
+	UnregisterModes(mod, MODETYPE_USER);
+	UnregisterModes(mod, MODETYPE_CHANNEL);
+
 	std::vector<reference<ExtensionItem> > items;
 	ServerInstance->Extensions.BeginUnregister(modfind->second, items);
 	/* Give the module a chance to tidy out all its metadata */
@@ -371,11 +375,14 @@ void ModuleManager::DoSafeUnload(Module* mod)
 	{
 		Channel* chan = c->second;
 		++c;
-		mod->OnCleanup(TYPE_CHANNEL, chan);
+		mod->OnCleanup(ExtensionItem::EXT_CHANNEL, chan);
 		chan->doUnhookExtensions(items);
 		const Channel::MemberMap& users = chan->GetUsers();
 		for (Channel::MemberMap::const_iterator mi = users.begin(); mi != users.end(); ++mi)
+		{
+			mod->OnCleanup(ExtensionItem::EXT_MEMBERSHIP, mi->second);
 			mi->second->doUnhookExtensions(items);
+		}
 	}
 
 	const user_hash& users = ServerInstance->Users->GetUsers();
@@ -384,13 +391,10 @@ void ModuleManager::DoSafeUnload(Module* mod)
 		User* user = u->second;
 		// The module may quit the user (e.g. SSL mod unloading) and that will remove it from the container
 		++u;
-		mod->OnCleanup(TYPE_USER, user);
+		mod->OnCleanup(ExtensionItem::EXT_USER, user);
 		user->doUnhookExtensions(items);
 	}
 
-	UnregisterModes(mod, MODETYPE_USER);
-	UnregisterModes(mod, MODETYPE_CHANNEL);
-
 	for(std::multimap<std::string, ServiceProvider*>::iterator i = DataProviders.begin(); i != DataProviders.end(); )
 	{
 		std::multimap<std::string, ServiceProvider*>::iterator curr = i++;
@@ -467,10 +471,14 @@ void ModuleManager::LoadAll()
 	for (ConfigIter i = tags.first; i != tags.second; ++i)
 	{
 		ConfigTag* tag = i->second;
-		std::string name = tag->getString("name");
-		this->NewServices = &servicemap[ExpandModName(name)];
-		std::cout << "[" << con_green << "*" << con_reset << "] Loading module:\t" << con_green << name << con_reset << std::endl;
+		std::string name = ExpandModName(tag->getString("name"));
+		this->NewServices = &servicemap[name];
 
+		// Skip modules which are already loaded.
+		if (Modules.find(name) != Modules.end())
+			continue;
+
+		std::cout << "[" << con_green << "*" << con_reset << "] Loading module:\t" << con_green << name << con_reset << std::endl;
 		if (!this->Load(name, true))
 		{
 			ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, this->LastError());