From 9109df92271cd251a3b9c7045c1cd2db3de3a497 Mon Sep 17 00:00:00 2001
From: darthgandalf <darthgandalf@726aef4b-f618-498e-8847-2d620e286838>
Date: Tue, 7 Sep 2010 09:52:49 +0000
Subject: [PATCH] Load global modules before users.

git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2118 726aef4b-f618-498e-8847-2d620e286838
---
 znc.cpp | 81 +++++++++++++++++++++++++++------------------------------
 1 file changed, 38 insertions(+), 43 deletions(-)

diff --git a/znc.cpp b/znc.cpp
index 0446e35f..44e86419 100644
--- a/znc.cpp
+++ b/znc.cpp
@@ -1576,6 +1576,43 @@ bool CZNC::DoRehash(CString& sError)
 						CUtils::PrintError(sError);
 						return false;
 					}
+					CString sModRet;
+					CModule *pOldMod;
+
+					pOldMod = GetModules().FindModule(sModName);
+					if (!pOldMod) {
+						CUtils::PrintAction("Loading Global Module [" + sModName + "]");
+
+						bool bModRet = GetModules().LoadModule(sModName, sArgs, NULL, sModRet);
+
+						// If the module was loaded, sModRet contains
+						// "Loaded Module [name] ..." and we strip away this beginning.
+						if (bModRet)
+							sModRet = sModRet.Token(1, true, sModName + "] ");
+
+						CUtils::PrintStatus(bModRet, sModRet);
+						if (!bModRet) {
+							sError = sModRet;
+							return false;
+						}
+					} else if (pOldMod->GetArgs() != sArgs) {
+						CUtils::PrintAction("Reloading Global Module [" + sModName + "]");
+
+						bool bModRet = GetModules().ReloadModule(sModName, sArgs, NULL, sModRet);
+
+						// If the module was loaded, sModRet contains
+						// "Loaded Module [name] ..." and we strip away this beginning.
+						if (bModRet)
+							sModRet = sModRet.Token(1, true, sModName + "] ");
+
+						CUtils::PrintStatus(bModRet, sModRet);
+						if (!bModRet) {
+							sError = sModRet;
+							return false;
+						}
+					} else
+						CUtils::PrintMessage("Module [" + sModName + "] already loaded.");
+
 					msModules[sModName] = sArgs;
 					continue;
 				} else if (sName.Equals("ISpoofFormat")) {
@@ -1640,49 +1677,7 @@ bool CZNC::DoRehash(CString& sError)
 		}
 	}
 
-	// First step: Load and reload new modules or modules with new arguments
-	for (MCString::iterator it = msModules.begin(); it != msModules.end(); ++it) {
-		CString sModName = it->first;
-		CString sArgs = it->second;
-		CString sModRet;
-		CModule *pOldMod;
-
-		pOldMod = GetModules().FindModule(sModName);
-		if (!pOldMod) {
-			CUtils::PrintAction("Loading Global Module [" + sModName + "]");
-
-			bool bModRet = GetModules().LoadModule(sModName, sArgs, NULL, sModRet);
-
-			// If the module was loaded, sModRet contains
-			// "Loaded Module [name] ..." and we strip away this beginning.
-			if (bModRet)
-				sModRet = sModRet.Token(1, true, sModName + "] ");
-
-			CUtils::PrintStatus(bModRet, sModRet);
-			if (!bModRet) {
-				sError = sModRet;
-				return false;
-			}
-		} else if (pOldMod->GetArgs() != sArgs) {
-			CUtils::PrintAction("Reloading Global Module [" + sModName + "]");
-
-			bool bModRet = GetModules().ReloadModule(sModName, sArgs, NULL, sModRet);
-
-			// If the module was loaded, sModRet contains
-			// "Loaded Module [name] ..." and we strip away this beginning.
-			if (bModRet)
-				sModRet = sModRet.Token(1, true, sModName + "] ");
-
-			CUtils::PrintStatus(bModRet, sModRet);
-			if (!bModRet) {
-				sError = sModRet;
-				return false;
-			}
-		} else
-			CUtils::PrintMessage("Module [" + sModName + "] already loaded.");
-	}
-
-	// Second step: Unload modules which are no longer in the config
+	// Unload modules which are no longer in the config
 	set<CString> ssUnload;
 	for (size_t i = 0; i < GetModules().size(); i++) {
 		CModule *pCurMod = GetModules()[i];