Massive move of all of the Config variables out of global scope to the Config class

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

7 files changed, 110 insertions, 110 deletions

diff --git a/src/modules/cs_appendtopic.c b/src/modules/cs_appendtopic.c
index 7e050fd57..96cef82b7 100644
--- a/src/modules/cs_appendtopic.c
+++ b/src/modules/cs_appendtopic.c
@@ -69,9 +69,9 @@ class CommandCSAppendTopic : public Command
 			ci = c->ci;
 
 		if (!c)
-			notice_lang(s_ChanServ, u, CHAN_X_NOT_IN_USE, chan);
+			notice_lang(Config.s_ChanServ, u, CHAN_X_NOT_IN_USE, chan);
 		else if (!check_access(u, ci, CA_TOPIC))
-			notice_lang(s_ChanServ, u, ACCESS_DENIED);
+			notice_lang(Config.s_ChanServ, u, ACCESS_DENIED);
 		else
 		{
 			if (ci->last_topic)
@@ -96,20 +96,20 @@ class CommandCSAppendTopic : public Command
 				c->topic_time = ci->last_topic_time;
 
 			if (!check_access(u, ci, CA_TOPIC))
-				alog("%s: %s!%s@%s changed topic of %s as services admin.", s_ChanServ, u->nick, u->GetIdent().c_str(), u->host, c->name);
+				alog("%s: %s!%s@%s changed topic of %s as services admin.", Config.s_ChanServ, u->nick, u->GetIdent().c_str(), u->host, c->name);
 			if (ircd->join2set)
 			{
-				if (whosends(ci) == findbot(s_ChanServ))
+				if (whosends(ci) == findbot(Config.s_ChanServ))
 				{
-					ircdproto->SendJoin(findbot(s_ChanServ), c->name, c->creation_time);
-					ircdproto->SendMode(NULL, c->name, "+o %s", s_ChanServ);
+					ircdproto->SendJoin(findbot(Config.s_ChanServ), c->name, c->creation_time);
+					ircdproto->SendMode(NULL, c->name, "+o %s", Config.s_ChanServ);
 				}
 			}
 			ircdproto->SendTopic(whosends(ci), c->name, u->nick, topic, c->topic_time);
 			if (ircd->join2set)
 			{
-				if (whosends(ci) == findbot(s_ChanServ))
-					ircdproto->SendPart(findbot(s_ChanServ), c->name, NULL);
+				if (whosends(ci) == findbot(Config.s_ChanServ))
+					ircdproto->SendPart(findbot(Config.s_ChanServ), c->name, NULL);
 			}
 		}
 		return MOD_CONT;
@@ -117,16 +117,16 @@ class CommandCSAppendTopic : public Command
 
 	bool OnHelp(User *u, const ci::string &subcommand)
 	{
-		me->NoticeLang(s_ChanServ, u, LNG_APPENDTOPIC_SYNTAX);
-		ircdproto->SendMessage(findbot(s_ChanServ), u->nick, " ");
-		me->NoticeLang(s_ChanServ, u, LNG_CHAN_HELP_APPENDTOPIC);
+		me->NoticeLang(Config.s_ChanServ, u, LNG_APPENDTOPIC_SYNTAX);
+		ircdproto->SendMessage(findbot(Config.s_ChanServ), u->nick, " ");
+		me->NoticeLang(Config.s_ChanServ, u, LNG_CHAN_HELP_APPENDTOPIC);
 
 		return true;
 	}
 
 	void OnSyntaxError(User *u, const ci::string &subcommand)
 	{
-		me->NoticeLang(s_ChanServ, u, LNG_APPENDTOPIC_SYNTAX);
+		me->NoticeLang(Config.s_ChanServ, u, LNG_APPENDTOPIC_SYNTAX);
 	}
 };
 
@@ -227,7 +227,7 @@ class CSAppendTopic : public Module
 	}
 	void OnChanServHelp(User *u)
 	{
-		this->NoticeLang(s_ChanServ, u, LNG_CHAN_HELP);
+		this->NoticeLang(Config.s_ChanServ, u, LNG_CHAN_HELP);
 	}
 };
 
diff --git a/src/modules/cs_enforce.c b/src/modules/cs_enforce.c
index 0c384a237..6937d4dc8 100644
--- a/src/modules/cs_enforce.c
+++ b/src/modules/cs_enforce.c
@@ -123,12 +123,12 @@ class CommandCSEnforce : public Command
 				av[1] = mask;
 				reason = getstring(u, CHAN_NOT_ALLOWED_TO_JOIN);
 				ircdproto->SendMode(whosends(ci), ci->name, "+b %s %lu", mask, time(NULL));
-				chan_set_modes(s_ChanServ, c, 2, av, 1);
+				chan_set_modes(Config.s_ChanServ, c, 2, av, 1);
 				ircdproto->SendKick(whosends(ci), ci->name, u->nick, "%s", reason);
 				av[0] = ci->name;
 				av[1] = u->nick;
 				av[2] = reason;
-				do_kick(s_ChanServ, 3, av);
+				do_kick(Config.s_ChanServ, 3, av);
 			}
 			user = next;
 		} while (user);
@@ -166,13 +166,13 @@ class CommandCSEnforce : public Command
 				if (!c->HasMode(CMODE_REGISTERED))
 				{
 					ircdproto->SendMode(whosends(ci), ci->name, "+b %s %lu", mask, time(NULL));
-					chan_set_modes(s_ChanServ, c, 2, av, 1);
+					chan_set_modes(Config.s_ChanServ, c, 2, av, 1);
 				}
 				ircdproto->SendKick(whosends(ci), ci->name, u->nick, "%s", reason);
 				av[0] = ci->name;
 				av[1] = u->nick;
 				av[2] = reason;
-				do_kick(s_ChanServ, 3, av);
+				do_kick(Config.s_ChanServ, 3, av);
 			}
 			user = next;
 		} while (user);
@@ -193,35 +193,35 @@ class CommandCSEnforce : public Command
 			ci = c->ci;
 
 		if (!c)
-			notice_lang(s_ChanServ, u, CHAN_X_NOT_IN_USE, chan);
+			notice_lang(Config.s_ChanServ, u, CHAN_X_NOT_IN_USE, chan);
 		else if (!check_access(u, ci, CA_AKICK))
-			notice_lang(s_ChanServ, u, ACCESS_DENIED);
+			notice_lang(Config.s_ChanServ, u, ACCESS_DENIED);
 		else
 		{
 			if (what.empty() || what == "SET")
 			{
 				this->DoSet(c);
-				me->NoticeLang(s_ChanServ, u, LNG_CHAN_RESPONSE, !what.empty() ? what.c_str() : "SET");
+				me->NoticeLang(Config.s_ChanServ, u, LNG_CHAN_RESPONSE, !what.empty() ? what.c_str() : "SET");
 			}
 			else if (what == "MODES")
 			{
 				this->DoModes(c);
-				me->NoticeLang(s_ChanServ, u, LNG_CHAN_RESPONSE, what.c_str());
+				me->NoticeLang(Config.s_ChanServ, u, LNG_CHAN_RESPONSE, what.c_str());
 			}
 			else if (what == "SECUREOPS")
 			{
 				this->DoSecureOps(c);
-				me->NoticeLang(s_ChanServ, u, LNG_CHAN_RESPONSE, what.c_str());
+				me->NoticeLang(Config.s_ChanServ, u, LNG_CHAN_RESPONSE, what.c_str());
 			}
 			else if (what == "RESTRICTED")
 			{
 				this->DoRestricted(c);
-				me->NoticeLang(s_ChanServ, u, LNG_CHAN_RESPONSE, what.c_str());
+				me->NoticeLang(Config.s_ChanServ, u, LNG_CHAN_RESPONSE, what.c_str());
 			}
 			else if (what == "+R")
 			{
 				this->DoCModeR(c);
-				me->NoticeLang(s_ChanServ, u, LNG_CHAN_RESPONSE, what.c_str());
+				me->NoticeLang(Config.s_ChanServ, u, LNG_CHAN_RESPONSE, what.c_str());
 			}
 			else
 				this->OnSyntaxError(u, "");
@@ -232,21 +232,21 @@ class CommandCSEnforce : public Command
 
 	bool OnHelp(User *u, const ci::string &subcommand)
 	{
-		me->NoticeLang(s_ChanServ, u, LNG_ENFORCE_SYNTAX);
-		ircdproto->SendMessage(findbot(s_ChanServ), u->nick, " ");
-		me->NoticeLang(s_ChanServ, u, LNG_CHAN_HELP_ENFORCE);
-		ircdproto->SendMessage(findbot(s_ChanServ), u->nick, " ");
+		me->NoticeLang(Config.s_ChanServ, u, LNG_ENFORCE_SYNTAX);
+		ircdproto->SendMessage(findbot(Config.s_ChanServ), u->nick, " ");
+		me->NoticeLang(Config.s_ChanServ, u, LNG_CHAN_HELP_ENFORCE);
+		ircdproto->SendMessage(findbot(Config.s_ChanServ), u->nick, " ");
 		if (ModeManager::FindChannelModeByName(CMODE_REGISTERED))
-			me->NoticeLang(s_ChanServ, u, LNG_CHAN_HELP_ENFORCE_R_ENABLED);
+			me->NoticeLang(Config.s_ChanServ, u, LNG_CHAN_HELP_ENFORCE_R_ENABLED);
 		else
-			me->NoticeLang(s_ChanServ, u, LNG_CHAN_HELP_ENFORCE_R_DISABLED);
+			me->NoticeLang(Config.s_ChanServ, u, LNG_CHAN_HELP_ENFORCE_R_DISABLED);
 
 		return true;
 	}
 
 	void OnSyntaxError(User *u, const ci::string &subcommand)
 	{
-		me->NoticeLang(s_ChanServ, u, LNG_ENFORCE_SYNTAX);
+		me->NoticeLang(Config.s_ChanServ, u, LNG_ENFORCE_SYNTAX);
 	}
 };
 
@@ -475,7 +475,7 @@ class CSEnforce : public Module
 	}
 	void OnChanServHelp(User *u)
 	{
-		this->NoticeLang(s_ChanServ, u, LNG_CHAN_HELP);
+		this->NoticeLang(Config.s_ChanServ, u, LNG_CHAN_HELP);
 	}
 };
 
diff --git a/src/modules/cs_tban.c b/src/modules/cs_tban.c
index 3368955b4..7da2a90ed 100644
--- a/src/modules/cs_tban.c
+++ b/src/modules/cs_tban.c
@@ -54,9 +54,9 @@ class CommandCSTBan : public Command
 		const char *time = params[2].c_str();
 
 		if (!(c = findchan(chan)))
-			notice_lang(s_ChanServ, u, CHAN_X_NOT_IN_USE, chan);
+			notice_lang(Config.s_ChanServ, u, CHAN_X_NOT_IN_USE, chan);
 		else if (!(u2 = finduser(nick)))
-			notice_lang(s_ChanServ, u, NICK_X_NOT_IN_USE, nick);
+			notice_lang(Config.s_ChanServ, u, NICK_X_NOT_IN_USE, nick);
 		else
 		{
 			if (canBanUser(c, u, u2))
@@ -73,15 +73,15 @@ class CommandCSTBan : public Command
 	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		this->OnSyntaxError(u, "");
-		ircdproto->SendMessage(findbot(s_ChanServ), u->nick, " ");
-		me->NoticeLang(s_ChanServ, u, TBAN_HELP_DETAIL);
+		ircdproto->SendMessage(findbot(Config.s_ChanServ), u->nick, " ");
+		me->NoticeLang(Config.s_ChanServ, u, TBAN_HELP_DETAIL);
 
 		return true;
 	}
 
 	void OnSyntaxError(User *u, const ci::string &subcommand)
 	{
-		me->NoticeLang(s_ChanServ, u, TBAN_SYNTAX);
+		me->NoticeLang(Config.s_ChanServ, u, TBAN_SYNTAX);
 	}
 };
 
@@ -159,13 +159,13 @@ class CSTBan : public Module
 	}
 	void OnChanServHelp(User *u)
 	{
-		this->NoticeLang(s_ChanServ, u, TBAN_HELP);
+		this->NoticeLang(Config.s_ChanServ, u, TBAN_HELP);
 	}
 };
 
 void mySendResponse(User *u, const char *channel, char *mask, const char *time)
 {
-	me->NoticeLang(s_ChanServ, u, TBAN_RESPONSE, mask, channel, time);
+	me->NoticeLang(Config.s_ChanServ, u, TBAN_RESPONSE, mask, channel, time);
 }
 
 class TempBan : public Timer
@@ -188,7 +188,7 @@ class TempBan : public Timer
 			if ((c = findchan(chan.c_str())) && c->ci)
 			{
 				ircdproto->SendMode(whosends(c->ci), c->name, "-b %s", av[1]);
-				chan_set_modes(s_ChanServ, c, 2, av, 1);
+				chan_set_modes(Config.s_ChanServ, c, 2, av, 1);
 			}
 		}
 };
@@ -205,7 +205,7 @@ void addBan(Channel *c, time_t timeout, char *banmask)
 	av[1] = banmask;
 
 	ircdproto->SendMode(whosends(c->ci), c->name, "+b %s", av[1]);
-	chan_set_modes(s_ChanServ, c, 2, av, 1);
+	chan_set_modes(Config.s_ChanServ, c, 2, av, 1);
 
 	me->AddCallBack(new TempBan(timeout, c->name, banmask));
 }
@@ -215,11 +215,11 @@ int canBanUser(Channel * c, User * u, User * u2)
 	ChannelInfo *ci = c->ci;
 	int ok = 0;
 	if (!check_access(u, ci, CA_BAN))
-		notice_lang(s_ChanServ, u, ACCESS_DENIED);
+		notice_lang(Config.s_ChanServ, u, ACCESS_DENIED);
 	else if (is_excepted(ci, u2))
-		notice_lang(s_ChanServ, u, CHAN_EXCEPTED, u2->nick, ci->name);
+		notice_lang(Config.s_ChanServ, u, CHAN_EXCEPTED, u2->nick, ci->name);
 	else if (is_protected(u2))
-		notice_lang(s_ChanServ, u, ACCESS_DENIED);
+		notice_lang(Config.s_ChanServ, u, ACCESS_DENIED);
 	else
 		ok = 1;
 
diff --git a/src/modules/hs_request.c b/src/modules/hs_request.c
index c2d42d4aa..4d01ee93d 100644
--- a/src/modules/hs_request.c
+++ b/src/modules/hs_request.c
@@ -93,13 +93,13 @@ class CommandHSRequest : public Command
 			rawhostmask = myStrGetTokenRemainder(rawhostmask, '@', 1); /* get the remaining string */
 			if (!rawhostmask)
 			{
-				me->NoticeLang(s_HostServ, u, LNG_REQUEST_SYNTAX);
+				me->NoticeLang(Config.s_HostServ, u, LNG_REQUEST_SYNTAX);
 				delete [] vIdent;
 				return MOD_CONT;
 			}
 			if (strlen(vIdent) > USERMAX - 1)
 			{
-				notice_lang(s_HostServ, u, HOST_SET_IDENTTOOLONG, USERMAX);
+				notice_lang(Config.s_HostServ, u, HOST_SET_IDENTTOOLONG, USERMAX);
 				delete [] vIdent;
 				delete [] rawhostmask;
 				return MOD_CONT;
@@ -110,7 +110,7 @@ class CommandHSRequest : public Command
 				{
 					if (!my_isvalidchar(*s))
 					{
-						notice_lang(s_HostServ, u, HOST_SET_IDENT_ERROR);
+						notice_lang(Config.s_HostServ, u, HOST_SET_IDENT_ERROR);
 						delete [] vIdent;
 						delete [] rawhostmask;
 						return MOD_CONT;
@@ -119,7 +119,7 @@ class CommandHSRequest : public Command
 			}
 			if (!ircd->vident)
 			{
-				notice_lang(s_HostServ, u, HOST_NO_VIDENT);
+				notice_lang(Config.s_HostServ, u, HOST_NO_VIDENT);
 				delete [] vIdent;
 				delete [] rawhostmask;
 				return MOD_CONT;
@@ -129,7 +129,7 @@ class CommandHSRequest : public Command
 			snprintf(hostmask, HOSTMAX, "%s", rawhostmask);
 		else
 		{
-			notice_lang(s_HostServ, u, HOST_SET_TOOLONG, HOSTMAX);
+			notice_lang(Config.s_HostServ, u, HOST_SET_TOOLONG, HOSTMAX);
 			if (vIdent)
 			{
 				delete [] vIdent;
@@ -140,7 +140,7 @@ class CommandHSRequest : public Command
 
 		if (!isValidHost(hostmask, 3))
 		{
-			notice_lang(s_HostServ, u, HOST_SET_ERROR);
+			notice_lang(Config.s_HostServ, u, HOST_SET_ERROR);
 			if (vIdent)
 			{
 				delete [] vIdent;
@@ -154,9 +154,9 @@ class CommandHSRequest : public Command
 		{
 			if (HSRequestMemoOper || HSRequestMemoSetters)
 			{
-				if (MSSendDelay > 0 && u && u->lastmemosend + MSSendDelay > now)
+				if (Config.MSSendDelay > 0 && u && u->lastmemosend + Config.MSSendDelay > now)
 				{
-					me->NoticeLang(s_HostServ, u, LNG_REQUEST_WAIT, MSSendDelay);
+					me->NoticeLang(Config.s_HostServ, u, LNG_REQUEST_WAIT, Config.MSSendDelay);
 					u->lastmemosend = now;
 					if (vIdent)
 					{
@@ -168,12 +168,12 @@ class CommandHSRequest : public Command
 			}
 			my_add_host_request(nick, vIdent, hostmask, u->nick, tmp_time);
 
-			me->NoticeLang(s_HostServ, u, LNG_REQUESTED);
+			me->NoticeLang(Config.s_HostServ, u, LNG_REQUESTED);
 			req_send_memos(u, vIdent, hostmask);
 			alog("New vHost Requested by %s", nick);
 		}
 		else
-			notice_lang(s_HostServ, u, HOST_NOREG, nick);
+			notice_lang(Config.s_HostServ, u, HOST_NOREG, nick);
 
 		if (vIdent)
 		{
@@ -186,16 +186,16 @@ class CommandHSRequest : public Command
 
 	bool OnHelp(User *u, const ci::string &subcommand)
 	{
-		me->NoticeLang(s_HostServ, u, LNG_REQUEST_SYNTAX);
-		ircdproto->SendMessage(findbot(s_HostServ), u->nick, " ");
-		me->NoticeLang(s_HostServ, u, LNG_HELP_REQUEST);
+		me->NoticeLang(Config.s_HostServ, u, LNG_REQUEST_SYNTAX);
+		ircdproto->SendMessage(findbot(Config.s_HostServ), u->nick, " ");
+		me->NoticeLang(Config.s_HostServ, u, LNG_HELP_REQUEST);
 
 		return true;
 	}
 
 	void OnSyntaxError(User *u, const ci::string &subcommand)
 	{
-		me->NoticeLang(s_HostServ, u, LNG_REQUEST_SYNTAX);
+		me->NoticeLang(Config.s_HostServ, u, LNG_REQUEST_SYNTAX);
 	}
 };
 
@@ -210,7 +210,7 @@ class CommandHSActivate : public Command
 	{
 		if (!u->nc->HasPriv("hostserv/set"))
 		{
-			notice_lang(s_HostServ, u, ACCESS_DENIED);
+			notice_lang(Config.s_HostServ, u, ACCESS_DENIED);
 			return MOD_CONT;
 		}
 
@@ -235,32 +235,32 @@ class CommandHSActivate : public Command
 					my_memo_lang(u, hc->nick, 2, LNG_ACTIVATE_MEMO);
 
 				hs_request_head = deleteHostCore(hs_request_head, tmp);
-				me->NoticeLang(s_HostServ, u, LNG_ACTIVATED, nick);
+				me->NoticeLang(Config.s_HostServ, u, LNG_ACTIVATED, nick);
 				alog("Host Request for %s activated by %s", nick, u->nick);
 			}
 			else
-				me->NoticeLang(s_HostServ, u, LNG_NO_REQUEST, nick);
+				me->NoticeLang(Config.s_HostServ, u, LNG_NO_REQUEST, nick);
 		}
 		else
-			notice_lang(s_HostServ, u, NICK_X_NOT_REGISTERED, nick);
+			notice_lang(Config.s_HostServ, u, NICK_X_NOT_REGISTERED, nick);
 
 		return MOD_CONT;
 	}
 
 	bool OnHelp(User *u, const ci::string &subcommand)
 	{
-		me->NoticeLang(s_HostServ, u, LNG_ACTIVATE_SYNTAX);
-		ircdproto->SendMessage(findbot(s_HostServ), u->nick, " ");
-		me->NoticeLang(s_HostServ, u, LNG_HELP_ACTIVATE);
+		me->NoticeLang(Config.s_HostServ, u, LNG_ACTIVATE_SYNTAX);
+		ircdproto->SendMessage(findbot(Config.s_HostServ), u->nick, " ");
+		me->NoticeLang(Config.s_HostServ, u, LNG_HELP_ACTIVATE);
 		if (HSRequestMemoUser)
-			me->NoticeLang(s_HostServ, u, LNG_HELP_ACTIVATE_MEMO);
+			me->NoticeLang(Config.s_HostServ, u, LNG_HELP_ACTIVATE_MEMO);
 
 		return true;
 	}
 
 	void OnSyntaxError(User *u, const ci::string &subcommand)
 	{
-		me->NoticeLang(s_HostServ, u, LNG_ACTIVATE_SYNTAX);
+		me->NoticeLang(Config.s_HostServ, u, LNG_ACTIVATE_SYNTAX);
 	}
 };
 
@@ -275,7 +275,7 @@ class CommandHSReject : public Command
 	{
 		if (!u->nc->HasPriv("hostserv/set"))
 		{
-			notice_lang(s_HostServ, u, ACCESS_DENIED);
+			notice_lang(Config.s_HostServ, u, ACCESS_DENIED);
 			return MOD_CONT;
 		}
 
@@ -301,29 +301,29 @@ class CommandHSReject : public Command
 			}
 
 			hs_request_head = deleteHostCore(hs_request_head, tmp);
-			me->NoticeLang(s_HostServ, u, LNG_REJECTED, nick);
+			me->NoticeLang(Config.s_HostServ, u, LNG_REJECTED, nick);
 			alog("Host Request for %s rejected by %s (%s)", nick, u->nick, reason ? reason : "");
 		}
 		else
-			me->NoticeLang(s_HostServ, u, LNG_NO_REQUEST, nick);
+			me->NoticeLang(Config.s_HostServ, u, LNG_NO_REQUEST, nick);
 
 		return MOD_CONT;
 	}
 
 	bool OnHelp(User *u, const ci::string &subcommand)
 	{
-		me->NoticeLang(s_HostServ, u, LNG_REJECT_SYNTAX);
-		ircdproto->SendMessage(findbot(s_HostServ), u->nick, " ");
-		me->NoticeLang(s_HostServ, u, LNG_HELP_REJECT);
+		me->NoticeLang(Config.s_HostServ, u, LNG_REJECT_SYNTAX);
+		ircdproto->SendMessage(findbot(Config.s_HostServ), u->nick, " ");
+		me->NoticeLang(Config.s_HostServ, u, LNG_HELP_REJECT);
 		if (HSRequestMemoUser)
-			me->NoticeLang(s_HostServ, u, LNG_HELP_REJECT_MEMO);
+			me->NoticeLang(Config.s_HostServ, u, LNG_HELP_REJECT_MEMO);
 
 		return true;
 	}
 
 	void OnSyntaxError(User *u, const ci::string &subcommand)
 	{
-		me->NoticeLang(s_HostServ, u, LNG_REJECT_SYNTAX);
+		me->NoticeLang(Config.s_HostServ, u, LNG_REJECT_SYNTAX);
 	}
 };
 
@@ -334,7 +334,7 @@ class HSListBase : public Command
 	{
 		if (!u->nc->HasPriv("hostserv/set"))
 		{
-			notice_lang(s_HostServ, u, ACCESS_DENIED);
+			notice_lang(Config.s_HostServ, u, ACCESS_DENIED);
 			return MOD_CONT;
 		}
 
@@ -348,20 +348,20 @@ class HSListBase : public Command
 		current = hs_request_head;
 		while (current)
 		{
-			if (((counter >= from && counter <= to) || (!from && !to)) && display_counter < NSListMax)
+			if (((counter >= from && counter <= to) || (!from && !to)) && display_counter < Config.NSListMax)
 			{
 				++display_counter;
 				tm = localtime(&current->time);
 				strftime(buf, sizeof(buf), getstring(u, STRFTIME_DATE_TIME_FORMAT), tm);
 				if (current->vIdent)
-					notice_lang(s_HostServ, u, HOST_IDENT_ENTRY, counter, current->nick, current->vIdent, current->vHost, current->creator, buf);
+					notice_lang(Config.s_HostServ, u, HOST_IDENT_ENTRY, counter, current->nick, current->vIdent, current->vHost, current->creator, buf);
 				else
-					notice_lang(s_HostServ, u, HOST_ENTRY, counter, current->nick, current->vHost, current->creator, buf);
+					notice_lang(Config.s_HostServ, u, HOST_ENTRY, counter, current->nick, current->vHost, current->creator, buf);
 			}
 			++counter;
 			current = current->next;
 		}
-		notice_lang(s_HostServ, u, HOST_LIST_FOOTER, display_counter);
+		notice_lang(Config.s_HostServ, u, HOST_LIST_FOOTER, display_counter);
 
 		return MOD_CONT;
 	}
@@ -390,9 +390,9 @@ class CommandHSWaiting : public HSListBase
 
 	bool OnHelp(User *u, const ci::string &subcommand)
 	{
-		me->NoticeLang(s_HostServ, u, LNG_WAITING_SYNTAX);
-		ircdproto->SendMessage(findbot(s_HostServ), u->nick, " ");
-		me->NoticeLang(s_HostServ, u, LNG_HELP_WAITING);
+		me->NoticeLang(Config.s_HostServ, u, LNG_WAITING_SYNTAX);
+		ircdproto->SendMessage(findbot(Config.s_HostServ), u->nick, " ");
+		me->NoticeLang(Config.s_HostServ, u, LNG_HELP_WAITING);
 
 		return true;
 	}
@@ -695,7 +695,7 @@ class HSRequest : public Module
 
 	EventReturn OnPreCommand(User *u, const std::string &service, const ci::string &command, const std::vector<ci::string> &params)
 	{
-		if (s_HostServ && service == s_HostServ)
+		if (Config.s_HostServ && service == Config.s_HostServ)
 		{
 			if (command == "LIST")
 			{
@@ -710,7 +710,7 @@ class HSRequest : public Module
 				}
 			}
 		}
-		else if (service == s_NickServ)
+		else if (service == Config.s_NickServ)
 		{
 			if (command == "DROP")
 			{
@@ -769,8 +769,8 @@ class HSRequest : public Module
 
 	void OnHostServHelp(User *u)
 	{
-		this->NoticeLang(s_HostServ, u, LNG_HELP);
-		this->NoticeLang(s_HostServ, u, LNG_HELP_SETTER);
+		this->NoticeLang(Config.s_HostServ, u, LNG_HELP);
+		this->NoticeLang(Config.s_HostServ, u, LNG_HELP_SETTER);
 	}
 };
 
@@ -831,7 +831,7 @@ void req_send_memos(User *u, char *vIdent, char *vHost)
 
 	if (HSRequestMemoOper == 1)
 	{
-		for (it = svsopers_in_config.begin(); it != svsopers_in_config.end(); ++it)
+		for (it = Config.Opers.begin(); it != Config.Opers.end(); ++it)
 		{
 			std::string nick = it->first;
 			my_memo_lang(u, nick.c_str(), z, LNG_REQUEST_MEMO, host);
diff --git a/src/modules/ns_maxemail.c b/src/modules/ns_maxemail.c
index a60db4ad7..2a86b1eed 100644
--- a/src/modules/ns_maxemail.c
+++ b/src/modules/ns_maxemail.c
@@ -103,7 +103,7 @@ class NSMaxEmail : public Module
 
 	EventReturn OnPreCommand(User *u, const std::string &service, const ci::string &command, const std::vector<ci::string> &params)
 	{
-		if (service == s_NickServ)
+		if (service == Config.s_NickServ)
 		{
 			if (command == "REGISTER")
 			{
@@ -155,9 +155,9 @@ bool check_email_limit_reached(const char *email, User * u)
 		return false;
 
 	if (NSEmailMax == 1)
-		me->NoticeLang(s_NickServ, u, LNG_NSEMAILMAX_REACHED_ONE);
+		me->NoticeLang(Config.s_NickServ, u, LNG_NSEMAILMAX_REACHED_ONE);
 	else
-		me->NoticeLang(s_NickServ, u, LNG_NSEMAILMAX_REACHED, NSEmailMax);
+		me->NoticeLang(Config.s_NickServ, u, LNG_NSEMAILMAX_REACHED, NSEmailMax);
 
 	return true;
 }
diff --git a/src/modules/os_ignore_db.c b/src/modules/os_ignore_db.c
index d5487b360..3989bde85 100644
--- a/src/modules/os_ignore_db.c
+++ b/src/modules/os_ignore_db.c
@@ -113,7 +113,7 @@ class OSIgnoreDB : public Module
 		IgnoreData *ign, *next;
 
 		now = time(NULL);
-		fill_db_ptr(dbptr, 0, IGNOREDBVERSION, s_OperServ, IgnoreDB);
+		fill_db_ptr(dbptr, 0, IGNOREDBVERSION, Config.s_OperServ, IgnoreDB);
 
 		/* time to backup the old db */
 		rename(IgnoreDB, dbptr->temp_name);
@@ -197,7 +197,7 @@ void load_ignore_db() {
 	IgnoreData *ign;
 
 	expiry_time = time(NULL);
-	fill_db_ptr(dbptr, 0, IGNOREDBVERSION, s_OperServ, IgnoreDB);
+	fill_db_ptr(dbptr, 0, IGNOREDBVERSION, Config.s_OperServ, IgnoreDB);
 
 	/* let's remove existing temp files here, because we only load dbs on startup */
 	remove(dbptr->temp_name);
diff --git a/src/modules/os_info.c b/src/modules/os_info.c
index 4f64738a4..f439a362f 100644
--- a/src/modules/os_info.c
+++ b/src/modules/os_info.c
@@ -74,11 +74,11 @@ class CommandNSOInfo : public Command
 			}
 			/* Add the module data to the user */
 			na->nc->Extend("os_info", sstrdup(info));
-			me->NoticeLang(s_NickServ, u, OINFO_ADD_SUCCESS, nick);
+			me->NoticeLang(Config.s_NickServ, u, OINFO_ADD_SUCCESS, nick);
 
 		}
 		else /* NickCore not found! */
-			notice_lang(s_NickServ, u, NICK_X_NOT_REGISTERED, nick);
+			notice_lang(Config.s_NickServ, u, NICK_X_NOT_REGISTERED, nick);
 
 		return MOD_CONT;
 	}
@@ -97,11 +97,11 @@ class CommandNSOInfo : public Command
 				na->nc->Shrink("os_info");
 			}
 
-			me->NoticeLang(s_NickServ, u, OINFO_DEL_SUCCESS, nick);
+			me->NoticeLang(Config.s_NickServ, u, OINFO_DEL_SUCCESS, nick);
 
 		}
 		else /* NickCore not found! */
-			notice_lang(s_NickServ, u, NICK_X_NOT_REGISTERED, nick);
+			notice_lang(Config.s_NickServ, u, NICK_X_NOT_REGISTERED, nick);
 
 		return MOD_CONT;
 	}
@@ -126,13 +126,13 @@ class CommandNSOInfo : public Command
 
 	bool OnHelp(User *u, const ci::string &subcommand)
 	{
-		me->NoticeLang(s_NickServ, u, OINFO_HELP);
+		me->NoticeLang(Config.s_NickServ, u, OINFO_HELP);
 		return true;
 	}
 
 	void OnSyntaxError(User *u, const ci::string &subcommand)
 	{
-		me->NoticeLang(s_NickServ, u, OINFO_SYNTAX);
+		me->NoticeLang(Config.s_NickServ, u, OINFO_SYNTAX);
 	}
 };
 
@@ -159,7 +159,7 @@ class CommandCSOInfo : public Command
 		}
 		/* Add the module data to the channel */
 		ci->Extend("os_info", sstrdup(info));
-		me->NoticeLang(s_ChanServ, u, OCINFO_ADD_SUCCESS, chan);
+		me->NoticeLang(Config.s_ChanServ, u, OCINFO_ADD_SUCCESS, chan);
 
 		return MOD_CONT;
 	}
@@ -176,7 +176,7 @@ class CommandCSOInfo : public Command
 			delete [] c;
 			ci->Shrink("os_info");
 		}
-		me->NoticeLang(s_ChanServ, u, OCINFO_DEL_SUCCESS, chan);
+		me->NoticeLang(Config.s_ChanServ, u, OCINFO_DEL_SUCCESS, chan);
 
 		return MOD_CONT;
 	}
@@ -200,13 +200,13 @@ class CommandCSOInfo : public Command
 
 	bool OnHelp(User *u, const ci::string &subcommand)
 	{
-		me->NoticeLang(s_ChanServ, u, OCINFO_HELP);
+		me->NoticeLang(Config.s_ChanServ, u, OCINFO_HELP);
 		return true;
 	}
 
 	void OnSyntaxError(User *u, const ci::string &subcommand)
 	{
-		me->NoticeLang(s_ChanServ, u, OCINFO_SYNTAX);
+		me->NoticeLang(Config.s_ChanServ, u, OCINFO_SYNTAX);
 	}
 };
 
@@ -504,7 +504,7 @@ class OSInfo : public Module
 	{
 		if (command == "INFO")
 		{
-			if (service == s_NickServ)
+			if (service == Config.s_NickServ)
 			{
 				const char *nick = params[0].c_str();
 				NickAlias *na = NULL;
@@ -516,11 +516,11 @@ class OSInfo : public Module
 						/* If we have any info on this user */
 						char *c;
 						if (na->nc->GetExt("os_info", c))
-							u->SendMessage(s_NickServ, " OperInfo: %s", c);
+							u->SendMessage(Config.s_NickServ, " OperInfo: %s", c);
 					}
 				}
 			}
-			else if (service == s_ChanServ)
+			else if (service == Config.s_ChanServ)
 			{
 				const char *chan = params[0].c_str();
 				ChannelInfo *ci = NULL;
@@ -532,7 +532,7 @@ class OSInfo : public Module
 						/* If we have any info on this channel */
 						char *c;
 						if (ci->GetExt("os_info", c))
-							u->SendMessage(s_ChanServ, " OperInfo: %s", c);
+							u->SendMessage(Config.s_ChanServ, " OperInfo: %s", c);
 					}
 				}
 			}
@@ -550,7 +550,7 @@ class OSInfo : public Module
 		if (!(out = fopen(OSInfoDBName, "w")))
 		{
 			alog("os_info: ERROR: can not open the database file!");
-			ircdproto->SendGlobops(s_OperServ, "os_info: ERROR: can not open the database file!");
+			ircdproto->SendGlobops(Config.s_OperServ, "os_info: ERROR: can not open the database file!");
 			ret = 1;
 		}
 		else
@@ -609,12 +609,12 @@ class OSInfo : public Module
 
 	void OnNickServHelp(User *u)
 	{
-		this->NoticeLang(s_NickServ, u, OINFO_HELP_CMD);
+		this->NoticeLang(Config.s_NickServ, u, OINFO_HELP_CMD);
 	}
 
 	void OnChanServHelp(User *u)
 	{
-		this->NoticeLang(s_ChanServ, u, OCINFO_HELP_CMD);
+		this->NoticeLang(Config.s_ChanServ, u, OCINFO_HELP_CMD);
 	}
 };