X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules.cpp;h=52a25d37cc8e0a43001776e402675eaf450364a1;hb=9d4004e8d477232c143830508a7a6e41fd2d31b7;hp=58c27e4902d236f26d294899bd057eb500e4d6e6;hpb=2b3d8e3d1841425af7412b3bf25657cf334c0175;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules.cpp b/src/modules.cpp
index 58c27e490..52a25d37c 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -155,13 +155,14 @@ ModResult	Module::OnUserList(User*, Channel*) { return MOD_RES_PASSTHRU; }
 ModResult	Module::OnWhoisLine(User*, User*, int&, std::string&) { return MOD_RES_PASSTHRU; }
 void		Module::OnBuildNeighborList(User*, UserChanList&, std::map<User*,bool>&) { }
 void		Module::OnGarbageCollect() { }
+ModResult	Module::OnSetConnectClass(LocalUser* user, ConnectClass* myclass) { return MOD_RES_PASSTHRU; }
 void 		Module::OnText(User*, void*, int, const std::string&, char, CUList&) { }
 void		Module::OnRunTestSuite() { }
 void		Module::OnNamesListItem(User*, Membership*, std::string&, std::string&) { }
 ModResult	Module::OnNumeric(User*, unsigned int, const std::string&) { return MOD_RES_PASSTHRU; }
 void		Module::OnHookIO(StreamSocket*, ListenSocket*) { }
 ModResult   Module::OnAcceptConnection(int, ListenSocket*, irc::sockets::sockaddrs*, irc::sockets::sockaddrs*) { return MOD_RES_PASSTHRU; }
-void		Module::OnSendWhoLine(User*, User*, Channel*, std::string&) { }
+void		Module::OnSendWhoLine(User*, const std::vector<std::string>&, User*, Channel*, std::string&) { }
 ModResult	Module::OnChannelRestrictionApply(User*, Channel*, const char*) { return MOD_RES_PASSTHRU; }
 
 ModuleManager::ModuleManager() : ModCount(0)
@@ -685,13 +686,27 @@ void FileReader::CalcSize()
 
 void FileReader::LoadFile(const std::string &filename)
 {
-	file_cache c;
-	c.clear();
-	if (ServerInstance->Config->ReadFile(c,filename.c_str()))
+	std::map<std::string, file_cache>::iterator file = ServerInstance->Config->Files.find(filename);
+	if (file != ServerInstance->Config->Files.end())
 	{
-		this->fc = c;
-		this->CalcSize();
+		this->fc = file->second;
 	}
+	else
+	{
+		fc.clear();
+		FILE* f = fopen(filename.c_str(), "r");
+		if (!f)
+			return;
+		char linebuf[MAXBUF*10];
+		while (fgets(linebuf, sizeof(linebuf), f))
+		{
+			int len = strlen(linebuf);
+			if (len)
+				fc.push_back(std::string(linebuf, len - 1));
+		}
+		fclose(f);
+	}
+	CalcSize();
 }