X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fconfigreader.cpp;h=e607c6e7d72e635564cbbae5ab7cdf9b3d968b4e;hb=11a2e3c46afca0ad74c02872eb398df30d8bdbb9;hp=49ef236d4087bd5954f3e4d951e58b8cf5fe33af;hpb=1c64da19e1f08e23fd7020427e89d1d5af35aa1c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/configreader.cpp b/src/configreader.cpp
index 49ef236d4..e607c6e7d 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -52,9 +52,11 @@ static ConfigTag* CreateEmptyTag()
 
 ServerConfig::ServerConfig()
 	: EmptyTag(CreateEmptyTag())
+	, Limits(EmptyTag)
+	, NoSnoticeStack(false)
 {
-	RawLog = HideBans = HideSplits = UndernetMsgPrefix = false;
-	WildcardIPv6 = InvBypassModes = true;
+	RawLog = HideBans = HideSplits = false;
+	WildcardIPv6 = true;
 	dns_timeout = 5;
 	MaxTargets = 20;
 	NetBufferSize = 10240;
@@ -411,7 +413,6 @@ void ServerConfig::Fill()
 	GenericOper = security->getBool("genericoper");
 	SyntaxHints = options->getBool("syntaxhints");
 	CycleHostsFromUser = options->getBool("cyclehostsfromuser");
-	UndernetMsgPrefix = options->getBool("ircumsgprefix");
 	FullHostInTopic = options->getBool("hostintopic");
 	MaxTargets = security->getInt("maxtargets", 20, 1, 31);
 	DefaultModes = options->getString("defaultmodes", "not");
@@ -425,7 +426,6 @@ void ServerConfig::Fill()
 	Paths.Data = ConfValue("path")->getString("datadir", INSPIRCD_DATA_PATH);
 	Paths.Log = ConfValue("path")->getString("logdir", INSPIRCD_LOG_PATH);
 	Paths.Module = ConfValue("path")->getString("moduledir", INSPIRCD_MODULE_PATH);
-	InvBypassModes = options->getBool("invitebypassmodes", true);
 	NoSnoticeStack = options->getBool("nosnoticestack", false);
 
 	if (Network.find(' ') != std::string::npos)
@@ -574,7 +574,7 @@ void ServerConfig::Apply(ServerConfig* old, const std::string &useruid)
 		 errstr << "Possible configuration error: you have not defined any <bind> blocks." << std::endl
 			 << "You will need to do this if you want clients to be able to connect!" << std::endl;
 
-	if (old)
+	if (old && valid)
 	{
 		// On first run, ports are bound later on
 		FailedPortList pl;
@@ -612,7 +612,7 @@ void ServerConfig::Apply(ServerConfig* old, const std::string &useruid)
 			std::cout << line << std::endl;
 		// If a user is rehashing, tell them directly
 		if (user)
-			user->SendText(":%s NOTICE %s :*** %s", ServerInstance->Config->ServerName.c_str(), user->nick.c_str(), line.c_str());
+			user->WriteRemoteNotice(InspIRCd::Format("*** %s", line.c_str()));
 		// Also tell opers
 		ServerInstance->SNO->WriteGlobalSno('a', line);
 	}
@@ -626,11 +626,11 @@ void ServerConfig::Apply(ServerConfig* old, const std::string &useruid)
 		ConfigTag *tag = (*it)->config;
 		// Make sure our connection class allows motd colors
 		if(!tag->getBool("allowmotdcolors"))
-		      continue;
+			continue;
 
 		ConfigFileCache::iterator file = this->Files.find(tag->getString("motd", "motd"));
 		if (file != this->Files.end())
-		      InspIRCd::ProcessColors(file->second);
+			InspIRCd::ProcessColors(file->second);
 	}
 
 	/* No old configuration -> initial boot, nothing more to do here */
@@ -652,8 +652,7 @@ void ServerConfig::Apply(ServerConfig* old, const std::string &useruid)
 	ApplyModules(user);
 
 	if (user)
-		user->SendText(":%s NOTICE %s :*** Successfully rehashed server.",
-			ServerInstance->Config->ServerName.c_str(), user->nick.c_str());
+		user->WriteRemoteNotice("*** Successfully rehashed server.");
 	ServerInstance->SNO->WriteGlobalSno('a', "*** Successfully rehashed server.");
 }
 
@@ -669,6 +668,7 @@ void ServerConfig::ApplyModules(User* user)
 		std::string name;
 		if (tag->readString("name", name))
 		{
+			name = ModuleManager::ExpandModName(name);
 			// if this module is already loaded, the erase will succeed, so we need do nothing
 			// otherwise, we need to add the module (which will be done later)
 			if (removed_modules.erase(name) == 0)
@@ -687,33 +687,33 @@ void ServerConfig::ApplyModules(User* user)
 			ServerInstance->SNO->WriteGlobalSno('a', "*** REHASH UNLOADED MODULE: %s", modname.c_str());
 
 			if (user)
-				user->WriteNumeric(RPL_UNLOADEDMODULE, "%s :Module %s successfully unloaded.", modname.c_str(), modname.c_str());
+				user->WriteNumeric(RPL_UNLOADEDMODULE, modname, InspIRCd::Format("Module %s successfully unloaded.", modname.c_str()));
 			else
 				ServerInstance->SNO->WriteGlobalSno('a', "Module %s successfully unloaded.", modname.c_str());
 		}
 		else
 		{
 			if (user)
-				user->WriteNumeric(ERR_CANTUNLOADMODULE, "%s :Failed to unload module %s: %s", modname.c_str(), modname.c_str(), ServerInstance->Modules->LastError().c_str());
+				user->WriteNumeric(ERR_CANTUNLOADMODULE, modname, InspIRCd::Format("Failed to unload module %s: %s", modname.c_str(), ServerInstance->Modules->LastError().c_str()));
 			else
-				 ServerInstance->SNO->WriteGlobalSno('a', "Failed to unload module %s: %s", modname.c_str(), ServerInstance->Modules->LastError().c_str());
+				ServerInstance->SNO->WriteGlobalSno('a', "Failed to unload module %s: %s", modname.c_str(), ServerInstance->Modules->LastError().c_str());
 		}
 	}
 
 	for (std::vector<std::string>::iterator adding = added_modules.begin(); adding != added_modules.end(); adding++)
 	{
-		if (ServerInstance->Modules->Load(adding->c_str()))
+		if (ServerInstance->Modules->Load(*adding))
 		{
 			ServerInstance->SNO->WriteGlobalSno('a', "*** REHASH LOADED MODULE: %s",adding->c_str());
 			if (user)
-				user->WriteNumeric(RPL_LOADEDMODULE, "%s :Module %s successfully loaded.", adding->c_str(), adding->c_str());
+				user->WriteNumeric(RPL_LOADEDMODULE, *adding, InspIRCd::Format("Module %s successfully loaded.", adding->c_str()));
 			else
 				ServerInstance->SNO->WriteGlobalSno('a', "Module %s successfully loaded.", adding->c_str());
 		}
 		else
 		{
 			if (user)
-				user->WriteNumeric(ERR_CANTLOADMODULE, "%s :Failed to load module %s: %s", adding->c_str(), adding->c_str(), ServerInstance->Modules->LastError().c_str());
+				user->WriteNumeric(ERR_CANTLOADMODULE, *adding, InspIRCd::Format("Failed to load module %s: %s", adding->c_str(), ServerInstance->Modules->LastError().c_str()));
 			else
 				ServerInstance->SNO->WriteGlobalSno('a', "Failed to load module %s: %s", adding->c_str(), ServerInstance->Modules->LastError().c_str());
 		}
@@ -783,6 +783,7 @@ void ConfigReaderThread::Finish()
 		 * XXX: The order of these is IMPORTANT, do not reorder them without testing
 		 * thoroughly!!!
 		 */
+		ServerInstance->Users.RehashCloneCounts();
 		ServerInstance->XLines->CheckELines();
 		ServerInstance->XLines->ApplyLines();
 		ChanModeReference ban(NULL, "ban");