* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * InspIRCd: (C) 2002-2010 InspIRCd Development Team
* See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
class lwbNickHandler : public HandlerBase2<bool, const char*, size_t>
{
- InspIRCd* Server;
public:
- lwbNickHandler(InspIRCd* Srv) : Server(Srv) { }
+ lwbNickHandler() { }
virtual ~lwbNickHandler() { }
virtual bool Call(const char*, size_t);
};
class ModuleNationalChars : public Module
{
private:
-
- InspIRCd* ServerInstance;
- lwbNickHandler* myhandler;
+ 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 char*, size_t> rememberer;
bool forcequit;
const unsigned char * lowermap_rememberer;
public:
- ModuleNationalChars(InspIRCd* Me) : Module(Me)
+ ModuleNationalChars() : rememberer(ServerInstance->IsNick)
{
- rememberer = (caller2<bool, const char*, size_t> *) malloc(sizeof(rememberer));
-
lowermap_rememberer = national_case_insensitive_map;
memcpy(m_lower, rfc_case_insensitive_map, 256);
national_case_insensitive_map = m_lower;
- ServerInstance = Me;
-
- *rememberer = ServerInstance->IsNick;
- myhandler = new lwbNickHandler(ServerInstance);
- ServerInstance->IsNick = myhandler;
+ ServerInstance->IsNick = &myhandler;
Implementation eventlist[] = { I_OnRehash, I_On005Numeric };
ServerInstance->Modules->Attach(eventlist, this, 2);
- OnRehash(NULL, "");
+ OnRehash(NULL);
}
virtual void On005Numeric(std::string &output)
SearchAndReplace(output, std::string("CASEMAPPING=rfc1459"), tmp);
}
- virtual void OnRehash(User* user, const std::string ¶meter)
+ virtual void OnRehash(User* user)
{
- ConfigReader* conf = new ConfigReader(ServerInstance);
- charset = conf->ReadValue("nationalchars", "file", 0);
- casemapping = conf->ReadValue("nationalchars", "casemapping", charset, 0, false);
+ ConfigReader conf;
+ charset = conf.ReadValue("nationalchars", "file", 0);
+ casemapping = conf.ReadValue("nationalchars", "casemapping", charset, 0, false);
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 = conf.ReadFlag("nationalchars", "forcequit", 0);
CheckForceQuit("National character set changed");
- delete conf;
}
void CheckForceQuit(const char * message)
if (!forcequit)
return;
- for (std::vector<User*>::iterator iter = ServerInstance->Users->local_users.begin(); iter != ServerInstance->Users->local_users.end(); ++iter)
+ for (std::vector<LocalUser*>::iterator iter = ServerInstance->Users->local_users.begin(); iter != ServerInstance->Users->local_users.end(); ++iter)
{
/* Fix by Brain: Dont quit UID users */
User* n = *iter;
virtual ~ModuleNationalChars()
{
- delete myhandler;
- ServerInstance->IsNick = *rememberer;
- free(rememberer);
+ ServerInstance->IsNick = rememberer;
national_case_insensitive_map = lowermap_rememberer;
CheckForceQuit("National characters module unloaded");
}
virtual Version GetVersion()
{
- return Version("$Id$",VF_COMMON,API_VERSION);
+ return Version("Provides an ability to have non-RFC1459 nicks & support for national CASEMAPPING",VF_COMMON);
}
/*make an array to check against it 8bit characters a bit faster. Whether allowed or uppercase (for your needs).*/