Rename ChanMax to MaxChannel for consistency with the other limits.

6 files changed, 22 insertions, 22 deletions

diff --git a/src/channels.cpp b/src/channels.cpp
index 8507c2e6a..151bc62ba 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -193,8 +193,8 @@ Channel* Channel::JoinUser(LocalUser* user, std::string cname, bool override, co
 	}
 
 	// Crop channel name if it's too long
-	if (cname.length() > ServerInstance->Config->Limits.ChanMax)
-		cname.resize(ServerInstance->Config->Limits.ChanMax);
+	if (cname.length() > ServerInstance->Config->Limits.MaxChannel)
+		cname.resize(ServerInstance->Config->Limits.MaxChannel);
 
 	Channel* chan = ServerInstance->FindChan(cname);
 	bool created_by_local = (chan == NULL); // Flag that will be passed to modules in the OnUserJoin() hook later
diff --git a/src/configreader.cpp b/src/configreader.cpp
index 694910c5a..cefdab358 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -40,7 +40,7 @@
 ServerLimits::ServerLimits(std::shared_ptr<ConfigTag> tag)
 	: MaxLine(tag->getUInt("maxline", 512, 512))
 	, MaxNick(tag->getUInt("maxnick", 30, 1, MaxLine))
-	, ChanMax(tag->getUInt("maxchan", 64, 1, MaxLine))
+	, MaxChannel(tag->getUInt("maxchan", 64, 1, MaxLine))
 	, MaxModes(tag->getUInt("maxmodes", 20, 1))
 	, MaxUser(tag->getUInt("maxident", 10, 1))
 	, MaxQuit(tag->getUInt("maxquit", 255, 0, MaxLine))
diff --git a/src/coremods/core_info/isupport.cpp b/src/coremods/core_info/isupport.cpp
index cc897242f..3bb0ebfe0 100644
--- a/src/coremods/core_info/isupport.cpp
+++ b/src/coremods/core_info/isupport.cpp
@@ -73,22 +73,22 @@ void ISupportManager::Build()
 {
 	// Modules can add new tokens and also edit or remove existing tokens.
 	ISupport::TokenMap tokens = {
-		{ "AWAYLEN",     ConvToStr(ServerInstance->Config->Limits.MaxAway)  },
-		{ "CASEMAPPING", ServerInstance->Config->CaseMapping                },
-		{ "CHANNELLEN",  ConvToStr(ServerInstance->Config->Limits.ChanMax)  },
-		{ "CHANTYPES",   "#"                                                },
-		{ "HOSTLEN",     ConvToStr(ServerInstance->Config->Limits.MaxHost)  },
-		{ "KICKLEN",     ConvToStr(ServerInstance->Config->Limits.MaxKick)  },
-		{ "LINELEN",     ConvToStr(ServerInstance->Config->Limits.MaxLine)  },
-		{ "MAXTARGETS",  ConvToStr(ServerInstance->Config->MaxTargets)      },
-		{ "MODES",       ConvToStr(ServerInstance->Config->Limits.MaxModes) },
-		{ "NETWORK",     ServerInstance->Config->Network                    },
-		{ "NAMELEN",     ConvToStr(ServerInstance->Config->Limits.MaxReal)  },
-		{ "NICKLEN",     ConvToStr(ServerInstance->Config->Limits.MaxNick)  },
-		{ "PREFIX",      ServerInstance->Modes.BuildPrefixes()              },
-		{ "STATUSMSG",   ServerInstance->Modes.BuildPrefixes(false)         },
-		{ "TOPICLEN",    ConvToStr(ServerInstance->Config->Limits.MaxTopic) },
-		{ "USERLEN",     ConvToStr(ServerInstance->Config->Limits.MaxUser)  },
+		{ "AWAYLEN",     ConvToStr(ServerInstance->Config->Limits.MaxAway)    },
+		{ "CASEMAPPING", ServerInstance->Config->CaseMapping                  },
+		{ "CHANNELLEN",  ConvToStr(ServerInstance->Config->Limits.MaxChannel) },
+		{ "CHANTYPES",   "#"                                                  },
+		{ "HOSTLEN",     ConvToStr(ServerInstance->Config->Limits.MaxHost)    },
+		{ "KICKLEN",     ConvToStr(ServerInstance->Config->Limits.MaxKick)    },
+		{ "LINELEN",     ConvToStr(ServerInstance->Config->Limits.MaxLine)    },
+		{ "MAXTARGETS",  ConvToStr(ServerInstance->Config->MaxTargets)        },
+		{ "MODES",       ConvToStr(ServerInstance->Config->Limits.MaxModes)   },
+		{ "NETWORK",     ServerInstance->Config->Network                      },
+		{ "NAMELEN",     ConvToStr(ServerInstance->Config->Limits.MaxReal)    },
+		{ "NICKLEN",     ConvToStr(ServerInstance->Config->Limits.MaxNick)    },
+		{ "PREFIX",      ServerInstance->Modes.BuildPrefixes()                },
+		{ "STATUSMSG",   ServerInstance->Modes.BuildPrefixes(false)           },
+		{ "TOPICLEN",    ConvToStr(ServerInstance->Config->Limits.MaxTopic)   },
+		{ "USERLEN",     ConvToStr(ServerInstance->Config->Limits.MaxUser)    },
 	};
 	isupportevprov.Call(&ISupport::EventListener::OnBuildISupport, tokens);
 
diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index 00ffd343a..49ac87a19 100644
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -176,7 +176,7 @@ void InspIRCd::ProcessColors(file_cache& input)
 /* true for valid channel name, false else */
 bool InspIRCd::DefaultIsChannel(const std::string& chname)
 {
-	if (chname.empty() || chname.length() > ServerInstance->Config->Limits.ChanMax)
+	if (chname.empty() || chname.length() > ServerInstance->Config->Limits.MaxChannel)
 		return false;
 
 	if (chname[0] != '#')
diff --git a/src/modules/m_channames.cpp b/src/modules/m_channames.cpp
index af0d0d9df..321d1407f 100644
--- a/src/modules/m_channames.cpp
+++ b/src/modules/m_channames.cpp
@@ -34,7 +34,7 @@ class NewIsChannelHandler
 
 bool NewIsChannelHandler::Call(const std::string& channame)
 {
-	if (channame.empty() || channame.length() > ServerInstance->Config->Limits.ChanMax || channame[0] != '#')
+	if (channame.empty() || channame.length() > ServerInstance->Config->Limits.MaxChannel || channame[0] != '#')
 		return false;
 
 	for (std::string::const_iterator c = channame.begin(); c != channame.end(); ++c)
diff --git a/src/modules/m_spanningtree/capab.cpp b/src/modules/m_spanningtree/capab.cpp
index 528ccaf48..39adf99e1 100644
--- a/src/modules/m_spanningtree/capab.cpp
+++ b/src/modules/m_spanningtree/capab.cpp
@@ -161,7 +161,7 @@ void TreeSocket::SendCapabilities(int phase)
 
 	this->WriteLine("CAPAB CAPABILITIES " /* Preprocessor does this one. */
 			":NICKMAX="+ConvToStr(ServerInstance->Config->Limits.MaxNick)+
-			" CHANMAX="+ConvToStr(ServerInstance->Config->Limits.ChanMax)+
+			" CHANMAX="+ConvToStr(ServerInstance->Config->Limits.MaxChannel)+
 			" MAXMODES="+ConvToStr(ServerInstance->Config->Limits.MaxModes)+
 			" IDENTMAX="+ConvToStr(ServerInstance->Config->Limits.MaxUser)+
 			" MAXQUIT="+ConvToStr(ServerInstance->Config->Limits.MaxQuit)+