* +------------------------------------+
*
* InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- * E-mail:
+ * E-mail:
* <brain@chatspike.net>
* <Craig@chatspike.net>
*
#include "modules.h"
#include "helperfuncs.h"
+typedef std::map<irc::string,irc::string> censor_t;
+
/* $ModDesc: Provides user and channel +G mode */
class CensorException : public ModuleException
{
public:
- virtual char* GetReason()
+ virtual const char* GetReason()
{
return "Could not find <censor file=\"\"> definition in your config file!";
}
class ModuleCensor : public Module
{
- Server *Srv;
- ConfigReader *Conf, *MyConf;
+
+ Server *Srv;
+ censor_t censors;
public:
ModuleCensor(Server* Me)
* XXX - These module pre-date the include directive which exists since beta 5 -- Brain
*/
Srv = Me;
- Conf = new ConfigReader;
- std::string Censorfile = Conf->ReadValue("censor","file",0);
- MyConf = new ConfigReader(Censorfile);
- if ((Censorfile == "") || (!MyConf->Verify()))
- {
- CensorException e;
- throw(e);
- }
- Srv->Log(DEFAULT,std::string("m_censor: read configuration from ")+Censorfile);
+ OnRehash("");
Srv->AddExtendedMode('G',MT_CHANNEL,false,0,0);
Srv->AddExtendedMode('G',MT_CLIENT,false,0,0);
}
}
- virtual void On005Numeric(std::string &output)
- {
+ virtual void On005Numeric(std::string &output)
+ {
InsertMode(output,"G",4);
- }
+ }
virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list ¶ms)
virtual ~ModuleCensor()
{
- delete MyConf;
- delete Conf;
}
- virtual void ReplaceLine(std::string &text,std::string pattern, std::string replace)
+ virtual void ReplaceLine(irc::string &text, irc::string pattern, irc::string replace)
{
if ((pattern != "") && (text != ""))
{
- while (text.find(pattern) != std::string::npos)
+ while (text.find(pattern) != irc::string::npos)
{
int pos = text.find(pattern);
text.erase(pos,pattern.length());
{
bool active = false;
irc::string text2 = text.c_str();
- for (int index = 0; index < MyConf->Enumerate("badword"); index++)
- {
- irc::string pattern = (MyConf->ReadValue("badword","text",index)).c_str();
- if (text2.find(pattern) != std::string::npos)
+ for (censor_t::iterator index = censors.begin(); index != censors.end(); index++)
+ {
+ if (text2.find(index->first) != irc::string::npos)
{
- std::string replace = MyConf->ReadValue("badword","replace",index);
-
if (target_type == TYPE_USER)
{
userrec* t = (userrec*)dest;
else if (target_type == TYPE_CHANNEL)
{
chanrec* t = (chanrec*)dest;
- active = (t->IsCustomModeSet('G'));
+ active = (t->IsModeSet('G'));
}
if (active)
{
- this->ReplaceLine(text,std::string(pattern.c_str()),replace);
+ this->ReplaceLine(text2,index->first,index->second);
+ text = text2.c_str();
}
}
}
return OnUserPreMessage(user,dest,target_type,text,status);
}
- virtual void OnRehash(std::string parameter)
+ virtual void OnRehash(const std::string ¶meter)
{
/*
* reload our config file on rehash - we must destroy and re-allocate the classes
* to call the constructor again and re-read our data.
*/
- delete Conf;
- delete MyConf;
- Conf = new ConfigReader;
+ ConfigReader* Conf = new ConfigReader;
std::string Censorfile = Conf->ReadValue("censor","file",0);
// this automatically re-reads the configuration file into the class
- MyConf = new ConfigReader(Censorfile);
+ ConfigReader* MyConf = new ConfigReader(Censorfile);
if ((Censorfile == "") || (!MyConf->Verify()))
{
CensorException e;
throw(e);
}
- Srv->Log(DEFAULT,std::string("m_censor: read configuration from ")+Censorfile);
+ censors.clear();
+ for (int index = 0; index < MyConf->Enumerate("badword"); index++)
+ {
+ irc::string pattern = (MyConf->ReadValue("badword","text",index)).c_str();
+ irc::string replace = (MyConf->ReadValue("badword","replace",index)).c_str();
+ censors[pattern] = replace;
+ }
+ DELETE(Conf);
+ DELETE(MyConf);
}
virtual Version GetVersion()