Use CommandBase::Params instead of std::vector<std::string>.

[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 b3937b4a4e2adf6d430b2176ce23c32a1dadcf7b..81c2d2959f0fce348f93500a6266fc0c4a66070c 100644 (file)
--- a/src/modules/m_nationalchars.cpp
+++ b/src/modules/m_nationalchars.cpp
@@ -28,10 +28,10 @@
 #include "inspircd.h"
 #include <fstream>
 
-class lwbNickHandler : public HandlerBase1<bool, const std::string&>
+class lwbNickHandler
 {
  public:
-       bool Call(const std::string&);
+       static bool Call(const std::string&);
 };
 
                                                                 /*,m_reverse_additionalUp[256];*/
@@ -217,10 +217,9 @@ bool lwbNickHandler::Call(const std::string& nick)
 
 class ModuleNationalChars : public Module
 {
-       lwbNickHandler myhandler;
-       std::string charset, casemapping;
+       std::string charset;
        unsigned char m_additional[256], m_additionalUp[256], m_lower[256], m_upper[256];
-       caller1<bool, const std::string&> rememberer;
+       TR1NS::function<bool(const std::string&)> rememberer;
        bool forcequit;
        const unsigned char * lowermap_rememberer;
        unsigned char prev_map[256];
@@ -259,23 +258,27 @@ class ModuleNationalChars : public Module
                memcpy(m_lower, rfc_case_insensitive_map, 256);
                national_case_insensitive_map = m_lower;
 
-               ServerInstance->IsNick = &myhandler;
-       }
-
-       void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
-       {
-               tokens["CASEMAPPING"] = casemapping;
+               ServerInstance->IsNick = &lwbNickHandler::Call;
        }
 
        void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
                ConfigTag* tag = ServerInstance->Config->ConfValue("nationalchars");
                charset = tag->getString("file");
-               casemapping = tag->getString("casemapping", charset);
+               std::string casemapping = tag->getString("casemapping", FileSystem::GetFileName(charset));
+               if (casemapping.find(' ') != std::string::npos)
+                       throw ModuleException("<nationalchars:casemapping> must not contain any spaces!");
+               ServerInstance->Config->CaseMapping = casemapping;
+#if defined _WIN32
+               if (!FileSystem::StartsWithWindowsDriveLetter(charset))
+                       charset.insert(0, "./locales/");
+#else
                if(charset[0] != '/')
                        charset.insert(0, "../locales/");
+#endif
                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);
+               if (!loadtables(charset, tables, 8, 5))
+                       throw ModuleException("The locale file failed to load. Check your log file for more information.");
                forcequit = tag->getBool("forcequit");
                CheckForceQuit("National character set changed");
                CheckRehash();
@@ -320,13 +323,13 @@ class ModuleNationalChars : public Module
        }
 
        /*so Bynets Unreal distribution stuff*/
-       void loadtables(std::string filename, unsigned char ** tables, unsigned char cnt, char faillimit)
+       bool loadtables(std::string filename, unsigned char ** tables, unsigned char cnt, char faillimit)
        {
                std::ifstream ifs(ServerInstance->Config->Paths.PrependConfig(filename).c_str());
                if (ifs.fail())
                {
                        ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "loadtables() called for missing file: %s", filename.c_str());
-                       return;
+                       return false;
                }
 
                for (unsigned char n=0; n< cnt; n++)
@@ -341,11 +344,12 @@ class ModuleNationalChars : public Module
                        if (loadtable(ifs, tables[n], 255) && (n < faillimit))
                        {
                                ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "loadtables() called for illegal file: %s (line %d)", filename.c_str(), n+1);
-                               return;
+                               return false;
                        }
                }
 
                makereverse(m_additional, m_reverse_additional, sizeof(m_additional));
+               return true;
        }
 
        unsigned char symtoi(const char *t,unsigned char base)