X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nationalchars.cpp;h=f4cd13a852cbe06d6b5d0311fe6c06cdaf30b4c6;hb=551d687ec6d7ce44be35fae0dd7345fe73c4f63a;hp=1cd21420c3329ee35b7dc1c50d57f2c271c91733;hpb=553a8da754c8cd308bad2008018849714e70f9b7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nationalchars.cpp b/src/modules/m_nationalchars.cpp
index 1cd21420c..f4cd13a85 100644
--- a/src/modules/m_nationalchars.cpp
+++ b/src/modules/m_nationalchars.cpp
@@ -31,12 +31,12 @@
 
 /* $ModDesc: Provides an ability to have non-RFC1459 nicks & support for national CASEMAPPING */
 
-class lwbNickHandler : public HandlerBase2<bool, const char*, size_t>
+class lwbNickHandler : public HandlerBase2<bool, const std::string&, size_t>
 {
  public:
 	lwbNickHandler() { }
 	virtual ~lwbNickHandler() { }
-	virtual bool Call(const char*, size_t);
+	virtual bool Call(const std::string&, size_t);
 };
 
 								 /*,m_reverse_additionalUp[256];*/
@@ -71,11 +71,12 @@ char utf8size(unsigned char * mb)
 
 
 /* Conditions added */
-bool lwbNickHandler::Call(const char* n, size_t max)
+bool lwbNickHandler::Call(const std::string& nick, size_t max)
 {
-	if (!n || !*n)
+	if (nick.empty())
 		return false;
 
+	const char* n = nick.c_str();
 	unsigned int p = 0;
 	for (const char* i = n; *i; i++, p++)
 	{
@@ -221,45 +222,46 @@ bool lwbNickHandler::Call(const char* n, size_t max)
 
 class ModuleNationalChars : public Module
 {
- private:
 	lwbNickHandler myhandler;
 	std::string charset, casemapping;
 	unsigned char m_additional[256], m_additionalUp[256], m_lower[256], m_upper[256];
-	caller2<bool, const char*, size_t> rememberer;
+	caller2<bool, const std::string&, size_t> rememberer;
 	bool forcequit;
 	const unsigned char * lowermap_rememberer;
 
  public:
-	ModuleNationalChars() : rememberer(ServerInstance->IsNick)
+	ModuleNationalChars()
+		: rememberer(ServerInstance->IsNick), lowermap_rememberer(national_case_insensitive_map)
+	{
+	}
+
+	void init()
 	{
-		lowermap_rememberer = national_case_insensitive_map;
 		memcpy(m_lower, rfc_case_insensitive_map, 256);
 		national_case_insensitive_map = m_lower;
 
 		ServerInstance->IsNick = &myhandler;
 
 		Implementation eventlist[] = { I_OnRehash, I_On005Numeric };
-		ServerInstance->Modules->Attach(eventlist, this, 2);
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 		OnRehash(NULL);
 	}
 
-	virtual void On005Numeric(std::string &output)
+	virtual void On005Numeric(std::map<std::string, std::string>& tokens)
 	{
-		std::string tmp(casemapping);
-		tmp.insert(0, "CASEMAPPING=");
-		SearchAndReplace(output, std::string("CASEMAPPING=rfc1459"), tmp);
+		tokens["CASEMAPPING"] = casemapping;
 	}
 
 	virtual void OnRehash(User* user)
 	{
-		ConfigReader conf;
-		charset = conf.ReadValue("nationalchars", "file", 0);
-		casemapping = conf.ReadValue("nationalchars", "casemapping", charset, 0, false);
+		ConfigTag* tag = ServerInstance->Config->ConfValue("nationalchars");
+		charset = tag->getString("file");
+		casemapping = tag->getString("casemapping", charset);
 		if(charset[0] != '/')
 			charset.insert(0, "../locales/");
 		unsigned char * tables[8] = { m_additional, m_additionalMB, m_additionalUp, m_lower, m_upper, m_additionalUtf8, m_additionalUtf8range, m_additionalUtf8interval };
 		loadtables(charset, tables, 8, 5);
-		forcequit = conf.ReadFlag("nationalchars", "forcequit", 0);
+		forcequit = tag->getBool("forcequit");
 		CheckForceQuit("National character set changed");
 	}
 
@@ -268,11 +270,11 @@ class ModuleNationalChars : public Module
 		if (!forcequit)
 			return;
 
-		for (std::vector<LocalUser*>::iterator iter = ServerInstance->Users->local_users.begin(); iter != ServerInstance->Users->local_users.end(); ++iter)
+		for (LocalUserList::const_iterator iter = ServerInstance->Users->local_users.begin(); iter != ServerInstance->Users->local_users.end(); ++iter)
 		{
 			/* Fix by Brain: Dont quit UID users */
 			User* n = *iter;
-			if (!isdigit(n->nick[0]) && !ServerInstance->IsNick(n->nick.c_str(), ServerInstance->Config->Limits.NickMax))
+			if (!isdigit(n->nick[0]) && !ServerInstance->IsNick(n->nick, ServerInstance->Config->Limits.NickMax))
 				ServerInstance->Users->QuitUser(n, message);
 		}
 	}
@@ -303,7 +305,7 @@ class ModuleNationalChars : public Module
 		std::ifstream ifs(filename.c_str());
 		if (ifs.fail())
 		{
-			ServerInstance->Logs->Log("m_nationalchars",DEFAULT,"loadtables() called for missing file: %s", filename.c_str());
+			ServerInstance->Logs->Log("m_nationalchars",LOG_DEFAULT,"loadtables() called for missing file: %s", filename.c_str());
 			return;
 		}
 
@@ -318,7 +320,7 @@ class ModuleNationalChars : public Module
 		{
 			if (loadtable(ifs, tables[n], 255) && (n < faillimit))
 			{
-				ServerInstance->Logs->Log("m_nationalchars",DEFAULT,"loadtables() called for illegal file: %s (line %d)", filename.c_str(), n+1);
+				ServerInstance->Logs->Log("m_nationalchars",LOG_DEFAULT,"loadtables() called for illegal file: %s (line %d)", filename.c_str(), n+1);
 				return;
 			}
 		}