Fixed cs_xop to not add its commands until after it knows what modes as supported by the IRCd

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2849 5417fbe8-f217-4b02-8779-1006273d7864

3 files changed, 35 insertions, 7 deletions

diff --git a/include/modules.h b/include/modules.h
index 318f5e397..bf178d72d 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -1147,6 +1147,15 @@ class CoreExport Module
 	 */
 	virtual void OnModuleUnload(User *u, Module *m) { }
 
+	/** Called when a server is synced
+	 * @param s The server, can be our uplink server
+	 */
+	virtual void OnServerSync(Server *s) { }
+
+	/** Called when we sync with our uplink
+	 */
+	virtual void OnUplinkSync() { }
+
 };
 
 
@@ -1198,7 +1207,7 @@ enum Implementation
 		I_OnServerQuit, I_OnTopicUpdated,
 		I_OnEncrypt, I_OnEncryptInPlace, I_OnEncryptCheckLen, I_OnDecrypt, I_OnCheckPassword,
 		I_OnChannelModeSet, I_OnChannelModeUnset, I_OnUserModeSet, I_OnUserModeUnset, I_OnChannelModeAdd, I_OnUserModeAdd,
-		I_OnMLock, I_OnUnMLock,
+		I_OnMLock, I_OnUnMLock, I_OnServerSync, I_OnUplinkSync,
 	I_END
 };
 
diff --git a/src/core/cs_xop.c b/src/core/cs_xop.c
index 0f5f863dc..2fe9daf30 100644
--- a/src/core/cs_xop.c
+++ b/src/core/cs_xop.c
@@ -541,17 +541,30 @@ class CSXOP : public Module
 		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
-		if (ModeManager::FindChannelModeByName(CMODE_OWNER))
-			this->AddCommand(CHANSERV, new CommandCSQOP());
-		if (ModeManager::FindChannelModeByName(CMODE_PROTECT))
-			this->AddCommand(CHANSERV, new CommandCSAOP());
-		if (ModeManager::FindChannelModeByName(CMODE_HALFOP))
-			this->AddCommand(CHANSERV, new CommandCSHOP());
 		this->AddCommand(CHANSERV, new CommandCSSOP());
+		this->AddCommand(CHANSERV, new CommandCSAOP());
 		this->AddCommand(CHANSERV, new CommandCSVOP());
 
+		if (serv_uplink && is_sync(serv_uplink))
+			OnUplinkSync();
+		else
+		{
+			/* We don't want to add some commands until we are synced, so we know what modes
+			 * exist and what dont
+			 */
+			ModuleManager::Attach(I_OnUplinkSync, this);
+		}
 		ModuleManager::Attach(I_OnChanServHelp, this);
 	}
+
+	void OnUplinkSync()
+	{
+		if (ModeManager::FindChannelModeByName(CMODE_OWNER))
+			this->AddCommand(CHANSERV, new CommandCSQOP());
+		if (ModeManager::FindChannelModeByName(CMODE_HALFOP))
+			this->AddCommand(CHANSERV, new CommandCSHOP());
+	}
+
 	void OnChanServHelp(User *u)
 	{
 		if (ModeManager::FindChannelModeByName(CMODE_OWNER))
diff --git a/src/servers.c b/src/servers.c
index 959e2be2d..c16305c1d 100644
--- a/src/servers.c
+++ b/src/servers.c
@@ -566,6 +566,12 @@ void finish_sync(Server * serv, int sync_links)
 	// Perhaps this should be done if serv == serv_uplink?
 	restore_unsynced_topics();
 	Alog() << "Server " << serv->name << " is done syncing";
+
+	FOREACH_MOD(I_OnServerSync, OnServerSync(s));
+	if (serv == serv_uplink)
+	{
+		FOREACH_MOD(I_OnUplinkSync, OnUplinkSync());
+	}
 }
 
 /*******************************************************************/