X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fconfigreader.cpp;h=5b430afe1b0dc1f5f8a2f62542243497d8585c16;hb=bf0dd0513e016abb4025748fe12e57539078c70b;hp=10913778776c4a399e6a6add5de968313704705b;hpb=7fdd55570ea6269c096e6a3c8eae30c1a1587533;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/configreader.cpp b/src/configreader.cpp
index 109137787..5b430afe1 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -11,20 +11,6 @@
  * ---------------------------------------------------
  */
 
-/* $Core */
-/* $CopyInstall: conf/inspircd.quotes.example $(CONPATH) */
-/* $CopyInstall: conf/inspircd.rules.example $(CONPATH) */
-/* $CopyInstall: conf/inspircd.motd.example $(CONPATH) */
-/* $CopyInstall: conf/inspircd.helpop-full.example $(CONPATH) */
-/* $CopyInstall: conf/inspircd.helpop.example $(CONPATH) */
-/* $CopyInstall: conf/inspircd.censor.example $(CONPATH) */
-/* $CopyInstall: conf/inspircd.filter.example $(CONPATH) */
-/* $CopyInstall: conf/inspircd.conf.example $(CONPATH) */
-/* $CopyInstall: conf/modules.conf.example $(CONPATH) */
-/* $CopyInstall: conf/opers.conf.example $(CONPATH) */
-/* $CopyInstall: conf/links.conf.example $(CONPATH) */
-/* $CopyInstall: tools/gdbargs $(BASE)/.gdbargs */
-
 #include "inspircd.h"
 #include <fstream>
 #include "xline.h"
@@ -51,28 +37,29 @@ ServerConfig::ServerConfig()
 void ServerConfig::Update005()
 {
 	std::stringstream out(data005);
+	std::vector<std::string> data;
 	std::string token;
+	while (out >> token)
+		data.push_back(token);
+	sort(data.begin(), data.end());
+
 	std::string line5;
-	int token_counter = 0;
 	isupport.clear();
-	while (out >> token)
+	for(unsigned int i=0; i < data.size(); i++)
 	{
+		token = data[i];
 		line5 = line5 + token + " ";
-		token_counter++;
-		if (token_counter >= 13)
+		if (i % 13 == 12)
 		{
-			char buf[MAXBUF];
-			snprintf(buf, MAXBUF, "%s:are supported by this server", line5.c_str());
-			isupport.push_back(buf);
+			line5.append(":are supported by this server");
+			isupport.push_back(line5);
 			line5.clear();
-			token_counter = 0;
 		}
 	}
 	if (!line5.empty())
 	{
-		char buf[MAXBUF];
-		snprintf(buf, MAXBUF, "%s:are supported by this server", line5.c_str());
-		isupport.push_back(buf);
+		line5.append(":are supported by this server");
+		isupport.push_back(line5);
 	}
 }
 
@@ -360,8 +347,6 @@ void ServerConfig::CrossCheckConnectBlocks(ServerConfig* current)
 
 			me->name = name;
 
-			tag->readString("password", me->pass);
-			tag->readString("hash", me->hash);
 			me->registration_timeout = tag->getInt("timeout", me->registration_timeout);
 			me->pingtime = tag->getInt("pingfreq", me->pingtime);
 			std::string sendq;
@@ -383,7 +368,6 @@ void ServerConfig::CrossCheckConnectBlocks(ServerConfig* current)
 			me->fakelag = tag->getBool("fakelag", me->fakelag);
 			me->maxlocal = tag->getInt("localmax", me->maxlocal);
 			me->maxglobal = tag->getInt("globalmax", me->maxglobal);
-			me->port = tag->getInt("port", me->port);
 			me->maxchans = tag->getInt("maxchans", me->maxchans);
 			me->limit = tag->getInt("limit", me->limit);
 
@@ -486,7 +470,6 @@ void ServerConfig::Fill()
 	WhoWasGroupSize = ConfValue("whowas")->getInt("groupsize");
 	WhoWasMaxGroups = ConfValue("whowas")->getInt("maxgroups");
 	WhoWasMaxKeep = ServerInstance->Duration(ConfValue("whowas")->getString("maxkeep"));
-	DieValue = ConfValue("die")->getString("value");
 	MaxChans = ConfValue("channels")->getInt("users", 20);
 	OperMaxChans = ConfValue("channels")->getInt("opers", 60);
 	c_ipv4_range = ConfValue("cidr")->getInt("ipv4clone", 32);
@@ -590,8 +573,6 @@ void ServerConfig::Read()
 	}
 	if (valid)
 	{
-		ReadFile(MOTD, ConfValue("files")->getString("motd"));
-		ReadFile(RULES, ConfValue("files")->getString("rules"));
 		DNSServer = ConfValue("dns")->getString("server");
 		FindDNS(DNSServer);
 	}
@@ -794,34 +775,6 @@ ConfigTagList ServerConfig::ConfTags(const std::string& tag)
 	return config_data.equal_range(tag);
 }
 
-/** Read the contents of a file located by `fname' into a file_cache pointed at by `F'.
- */
-bool ServerConfig::ReadFile(file_cache &F, const std::string& fname)
-{
-	if (fname.empty())
-		return false;
-
-	char linebuf[MAXBUF];
-
-	F.clear();
-
-	FileWrapper file(fopen(fname.c_str(), "r"));
-
-	if (!file)
-		return false;
-	while (!feof(file))
-	{
-		if (fgets(linebuf, sizeof(linebuf), file))
-			linebuf[strlen(linebuf)-1] = 0;
-		else
-			*linebuf = 0;
-
-		F.push_back(*linebuf ? linebuf : " ");
-	}
-
-	return true;
-}
-
 bool ServerConfig::FileExists(const char* file)
 {
 	struct stat sb;