X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fserver.cpp;h=66466fae94cbdbbd65e86566c1526b0370eee561;hb=024906dbcdfd1e48898167695712a6c9e0fc7e9a;hp=4974b8501c014a7c89176aec0f08e8471450191d;hpb=6c7a3ceb6c674a9af09da955ee0238e9291cf29a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/server.cpp b/src/server.cpp
index 4974b8501..66466fae9 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -61,15 +61,15 @@ void InspIRCd::Rehash(const std::string& uuid)
 	if (!ServerInstance->ConfigThread)
 	{
 		ServerInstance->ConfigThread = new ConfigReaderThread(uuid);
-		ServerInstance->Threads->Start(ServerInstance->ConfigThread);
+		ServerInstance->Threads.Start(ServerInstance->ConfigThread);
 	}
 }
 
 std::string InspIRCd::GetVersionString(bool getFullVersion)
 {
 	if (getFullVersion)
-		return VERSION " " + Config->ServerName + " :" SYSTEM " [" REVISION "," + SE->GetName() + "," + Config->sid + "]";
-	return BRANCH " " + Config->ServerName + " :" + Config->CustomVersion;
+		return INSPIRCD_VERSION " " + Config->ServerName + " :" INSPIRCD_SYSTEM " [" INSPIRCD_REVISION "," INSPIRCD_SOCKETENGINE_NAME "," + Config->sid + "]";
+	return INSPIRCD_BRANCH " " + Config->ServerName + " :" + Config->CustomVersion;
 }
 
 std::string UIDGenerator::GenerateSID(const std::string& servername, const std::string& serverdesc)
@@ -169,10 +169,9 @@ void ISupportManager::Build()
 
 	tokens["AWAYLEN"] = ConvToStr(ServerInstance->Config->Limits.MaxAway);
 	tokens["CASEMAPPING"] = "rfc1459";
-	tokens["CHANMODES"] = ServerInstance->Modes->GiveModeList(MASK_CHANNEL);
+	tokens["CHANMODES"] = ServerInstance->Modes->GiveModeList(MODETYPE_CHANNEL);
 	tokens["CHANNELLEN"] = ConvToStr(ServerInstance->Config->Limits.ChanMax);
 	tokens["CHANTYPES"] = "#";
-	tokens["CHARSET"] = "ascii";
 	tokens["ELIST"] = "MU";
 	tokens["KICKLEN"] = ConvToStr(ServerInstance->Config->Limits.MaxKick);
 	tokens["MAXBANS"] = "64"; // TODO: make this a config setting.
@@ -185,8 +184,7 @@ void ISupportManager::Build()
 	tokens["STATUSMSG"] = ServerInstance->Modes->BuildPrefixes(false);
 	tokens["TOPICLEN"] = ConvToStr(ServerInstance->Config->Limits.MaxTopic);
 
-	tokens["FNC"] = tokens["VBANLIST"] =
-		tokens["WALLCHOPS"] = tokens["WALLVOICES"];
+	tokens["FNC"] = tokens["VBANLIST"];
 
 	// Modules can add new tokens and also edit or remove existing tokens
 	FOREACH_MOD(On005Numeric, (tokens));
@@ -195,7 +193,7 @@ void ISupportManager::Build()
 	std::map<std::string, std::string>::iterator extban = tokens.find("EXTBAN");
 	if (extban != tokens.end())
 	{
-		sort(extban->second.begin(), extban->second.end());
+		std::sort(extban->second.begin(), extban->second.end());
 		extban->second.insert(0, ",");
 	}