X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_censor.cpp;h=69db8bbe6936d9c304be62c53e6dd161b0c14673;hb=1484a054870bdfe94346057053d5c8e48a708232;hp=45f5af551a80ccf9abc668f13156175ebd4ab1c6;hpb=2aa83b37d3df064f1053bd9123673c28f1eff202;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_censor.cpp b/src/modules/m_censor.cpp index 45f5af551..69db8bbe6 100644 --- a/src/modules/m_censor.cpp +++ b/src/modules/m_censor.cpp @@ -3,7 +3,7 @@ * +------------------------------------+ * * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: + * E-mail: * * * @@ -23,12 +23,86 @@ using namespace std; #include "modules.h" #include "helperfuncs.h" +typedef std::map censor_t; + /* $ModDesc: Provides user and channel +G mode */ +class CensorException : public ModuleException +{ + public: + virtual const char* GetReason() + { + return "Could not find definition in your config file!"; + } +}; + +class CensorUser : public ModeHandler +{ + public: + CensorUser() : ModeHandler('G', 0, 0, false, MODETYPE_USER, false) { } + + ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) + { + /* Only opers can change other users modes */ + if ((source != dest) && (!*source->oper)) + return MODEACTION_DENY; + + if (adding) + { + if (!dest->IsModeSet('G')) + { + dest->SetMode('G',true); + return MODEACTION_ALLOW; + } + } + else + { + if (dest->IsModeSet('G')) + { + dest->SetMode('G',false); + return MODEACTION_ALLOW; + } + } + + return MODEACTION_DENY; + } +}; + +class CensorChannel : public ModeHandler +{ + public: + CensorChannel() : ModeHandler('G', 0, 0, false, MODETYPE_CHANNEL, false) { } + + ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) + { + if (adding) + { + if (!channel->IsModeSet('G')) + { + channel->SetMode('G',false); + return MODEACTION_ALLOW; + } + } + else + { + if (channel->IsModeSet('G')) + { + channel->SetMode('G',false); + return MODEACTION_ALLOW; + } + } + + return MODEACTION_ALLOW; + } +}; + class ModuleCensor : public Module { - Server *Srv; - ConfigReader *Conf, *MyConf; + + Server *Srv; + censor_t censors; + CensorUser *cu; + CensorChannel *cc; public: ModuleCensor(Server* Me) @@ -47,56 +121,35 @@ class ModuleCensor : public Module * 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())) - { - printf("Error, could not find definition in your config file!"); - log(DEFAULT,"Error, could not find definition in your config file!"); - return; - } - Srv->Log(DEFAULT,std::string("m_censor: read configuration from ")+Censorfile); - Srv->AddExtendedMode('G',MT_CHANNEL,false,0,0); - Srv->AddExtendedMode('G',MT_CLIENT,false,0,0); + OnRehash(""); + cu = new CensorUser; + cc = new CensorChannel; + Srv->AddMode(cu, 'G'); + Srv->AddMode(cc, 'G'); } void Implements(char* List) { - List[I_OnRehash] = List[I_On005Numeric] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnExtendedMode] = 1; + List[I_OnRehash] = List[I_On005Numeric] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1; } - 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 void On005Numeric(std::string &output) { - // check if this is our mode character... - if (modechar == 'G') - { - return 1; - } - else - { - return 0; - } + InsertMode(output,"G",4); } - + virtual ~ModuleCensor() { - delete MyConf; - delete Conf; + DELETE(cu); + DELETE(cc); } - 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()); @@ -107,85 +160,64 @@ class ModuleCensor : public Module // format of a config entry is - virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text) + virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status) { bool active = false; - for (int index = 0; index < MyConf->Enumerate("badword"); index++) - { - std::string pattern = MyConf->ReadValue("badword","text",index); - if (text.find(pattern) != std::string::npos) + irc::string text2 = text.c_str(); + 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; - active = (strchr(t->modes,'G') > 0); + active = t->IsModeSet('G'); } else if (target_type == TYPE_CHANNEL) { chanrec* t = (chanrec*)dest; - active = (t->IsCustomModeSet('G')); + active = t->IsModeSet('G'); } if (active) { - this->ReplaceLine(text,pattern,replace); + this->ReplaceLine(text2,index->first,index->second); + text = text2.c_str(); } } } return 0; } - virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text) + virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status) { - bool active = false; - for (int index = 0; index < MyConf->Enumerate("badword"); index++) - { - std::string pattern = MyConf->ReadValue("badword","text",index); - if (text.find(pattern) != std::string::npos) - { - std::string replace = MyConf->ReadValue("badword","replace",index); - - if (target_type == TYPE_USER) - { - userrec* t = (userrec*)dest; - active = (strchr(t->modes,'G') > 0); - } - else if (target_type == TYPE_CHANNEL) - { - chanrec* t = (chanrec*)dest; - active = (t->IsCustomModeSet('G')); - } - - if (active) - { - this->ReplaceLine(text,pattern,replace); - } - } - } - return 0; + 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())) { - // bail if the user forgot to create a config file - printf("Error, could not find definition in your config file!\n"); - log(DEFAULT,"Error, could not find definition in your config file!"); + 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() @@ -221,4 +253,3 @@ extern "C" void * init_module( void ) { return new ModuleCensorFactory; } -