X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nationalchars.cpp;h=b43b6e2b6a05e55cdc9e0efd058790caa7a0545d;hb=484bb1ef629d510f5b9bccf56f54c5af27fa3650;hp=642145adda047ffb85ea2d08436d1f989588261f;hpb=92974819e3bf1c3a97b83f6f4ccc612283120794;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nationalchars.cpp b/src/modules/m_nationalchars.cpp
index 642145add..b43b6e2b6 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-2010 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
@@ -221,16 +230,20 @@ class ModuleNationalChars : public Module
 	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);
 	}
 
@@ -243,13 +256,14 @@ 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");
 	}
 
@@ -258,7 +272,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;