m_nokicks Remove u-line check, OnUserPreKick doesn't run in that case

[user/henk/code/inspircd.git] / src / modules / m_nationalchars.cpp

diff --git a/src/modules/m_nationalchars.cpp b/src/modules/m_nationalchars.cpp
index 642145adda047ffb85ea2d08436d1f989588261f..c59c1ba2a02ff24539c6077872df1c207489c21d 100644 (file)
--- 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
@@ -243,13 +252,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");
        }