X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_nationalchars.cpp;h=bf95f0f9f3992b70de15db10c427eb0ef2f1996e;hb=382662a8a4ae5c501b096643cb8f09d2d9d084d0;hp=e8a70d14873b51b626d7620f593c6989171fdbfd;hpb=9566b0bb159d994506094f011b5dcf73fc1c38a3;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nationalchars.cpp b/src/modules/m_nationalchars.cpp
index e8a70d148..bf95f0f9f 100644
--- a/src/modules/m_nationalchars.cpp
+++ b/src/modules/m_nationalchars.cpp
@@ -1,16 +1,25 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2009 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2009 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2009 Robin Burchell <robin+git@viroteck.net>
  *
- * This program is free but copyrighted software; see
- *	    the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 /* Contains a code of Unreal IRCd + Bynets patch ( http://www.unrealircd.com/ and http://www.bynets.org/ )
    Original patch is made by Dmitry "Killer{R}" Kononko. ( http://killprog.com/ )
    Changed at 2008-06-15 - 2009-02-11
@@ -219,18 +228,48 @@ class ModuleNationalChars : public Module
 	caller2<bool, const char*, size_t> rememberer;
 	bool forcequit;
 	const unsigned char * lowermap_rememberer;
+	unsigned char prev_map[256];
+
+	void CheckRehash()
+	{
+		// See if anything changed
+		if (!memcmp(prev_map, national_case_insensitive_map, sizeof(prev_map)))
+			return;
+
+		memcpy(prev_map, national_case_insensitive_map, sizeof(prev_map));
+
+		ServerInstance->RehashUsersAndChans();
+
+		// The OnGarbageCollect() method in m_watch rebuilds the hashmap used by it
+		Module* mod = ServerInstance->Modules->Find("m_watch.so");
+		if (mod)
+			mod->OnGarbageCollect();
+
+		// Send a Request to m_spanningtree asking it to rebuild its hashmaps
+		mod = ServerInstance->Modules->Find("m_spanningtree.so");
+		if (mod)
+		{
+			Request req(this, mod, "rehash");
+			req.Send();
+		}
+	}
 
  public:
-	ModuleNationalChars() : rememberer(ServerInstance->IsNick)
+	ModuleNationalChars()
+		: rememberer(ServerInstance->IsNick), lowermap_rememberer(national_case_insensitive_map)
+	{
+		memcpy(prev_map, national_case_insensitive_map, sizeof(prev_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);
 	}
 
@@ -243,14 +282,16 @@ class ModuleNationalChars : public Module
 
 	virtual void OnRehash(User* user)
 	{
-		ConfigReader conf;
-		charset = conf.ReadValue("nationalchars", "file", 0);
-		casemapping = conf.ReadValue("nationalchars", "casemapping", charset, 0, false);
-		charset.insert(0, "../locales/");
+		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");
+		CheckRehash();
 	}
 
 	void CheckForceQuit(const char * message)
@@ -258,7 +299,7 @@ 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;
@@ -272,11 +313,12 @@ class ModuleNationalChars : public Module
 		ServerInstance->IsNick = rememberer;
 		national_case_insensitive_map = lowermap_rememberer;
 		CheckForceQuit("National characters module unloaded");
+		CheckRehash();
 	}
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides an ability to have non-RFC1459 nicks & support for national CASEMAPPING",VF_COMMON);
+		return Version("Provides an ability to have non-RFC1459 nicks & support for national CASEMAPPING", VF_VENDOR | VF_COMMON, charset);
 	}
 
 	/*make an array to check against it 8bit characters a bit faster. Whether allowed or uppercase (for your needs).*/