X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules.cpp;h=6586166c8c21396094b1f89975675f8a283c7824;hb=4498f1abd163b140efcbbd9e75173665c9b1c29f;hp=11b06e96042071c43069a1c4c55be870f69ddad8;hpb=3cda2e0971d279b1840d1689bb2821a93d475a4e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules.cpp b/src/modules.cpp
index 11b06e960..6586166c8 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -101,6 +101,7 @@ void		Module::OnUnloadModule(Module*) { }
 void		Module::OnBackgroundTimer(time_t) { }
 ModResult	Module::OnPreCommand(std::string&, std::vector<std::string>&, LocalUser*, bool, const std::string&) { return MOD_RES_PASSTHRU; }
 void		Module::OnPostCommand(const std::string&, const std::vector<std::string>&, LocalUser*, CmdResult, const std::string&) { }
+void		Module::OnUserInit(LocalUser*) { }
 ModResult	Module::OnCheckReady(LocalUser*) { return MOD_RES_PASSTHRU; }
 ModResult	Module::OnUserRegister(LocalUser*) { return MOD_RES_PASSTHRU; }
 ModResult	Module::OnUserPreKick(User*, Membership*, const std::string&) { return MOD_RES_PASSTHRU; }
@@ -155,13 +156,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)
@@ -432,8 +434,7 @@ void ModuleManager::AddService(ServiceProvider& item)
 			if (!ServerInstance->Parser->AddCommand(static_cast<Command*>(&item)))
 				throw ModuleException("Command "+std::string(item.name)+" already exists.");
 			return;
-		case SERVICE_CMODE:
-		case SERVICE_UMODE:
+		case SERVICE_MODE:
 			if (!ServerInstance->Modes->AddMode(static_cast<ModeHandler*>(&item)))
 				throw ModuleException("Mode "+std::string(item.name)+" already exists.");
 			return;
@@ -524,6 +525,14 @@ void InspIRCd::SendMode(const std::vector<std::string>& parameters, User *user)
 	this->Modes->Process(parameters, user);
 }
 
+
+void InspIRCd::SendGlobalMode(const std::vector<std::string>& parameters, User *user)
+{
+	Modes->Process(parameters, user);
+	if (!Modes->GetLastParse().empty())
+		this->PI->SendMode(parameters[0], Modes->GetLastParseParams(), Modes->GetLastParseTranslate());
+}
+
 bool InspIRCd::AddResolver(Resolver* r, bool cached)
 {
 	if (!cached)
@@ -558,6 +567,8 @@ const std::vector<std::string> ModuleManager::GetAllModuleNames(int filter)
 ConfigReader::ConfigReader()
 {
 	this->error = 0;
+	ServerInstance->Logs->Log("MODULE", DEBUG, "ConfigReader is deprecated in 2.0; "
+		"use ServerInstance->Config->ConfValue(\"key\") or ->ConfTags(\"key\") instead");
 }
 
 
@@ -675,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 = file->second;
+	}
+	else
 	{
-		this->fc = c;
-		this->CalcSize();
+		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();
 }