X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_censor.cpp;h=03c5bfb69e2ff5685c14d7acdf5b26ce8ef60eff;hb=2ab88037d8d7d6df3fb9686216a0b36f5ece2313;hp=5cdee215de6d75b0e0e8edb8d43e02de7d83144a;hpb=d248ac1a94664492c55dd9086888faf289db7d55;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_censor.cpp b/src/modules/m_censor.cpp index 5cdee215d..03c5bfb69 100644 --- a/src/modules/m_censor.cpp +++ b/src/modules/m_censor.cpp @@ -2,25 +2,18 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * - * - * Written by Craig Edwards, Craig McLure, and others. + * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/Credits + * * This program is free but copyrighted software; see * the file COPYING for details. * * --------------------------------------------------- */ -using namespace std; +#define _CRT_SECURE_NO_DEPRECATE +#define _SCL_SECURE_NO_DEPRECATE -#include -#include -#include "users.h" -#include "channels.h" -#include "modules.h" #include "inspircd.h" typedef std::map censor_t; @@ -34,12 +27,8 @@ class CensorUser : public ModeHandler public: CensorUser(InspIRCd* Instance) : ModeHandler(Instance, 'G', 0, 0, false, MODETYPE_USER, false) { } - ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) + ModeAction OnModeChange(User* source, User* dest, Channel* 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')) @@ -68,13 +57,13 @@ class CensorChannel : public ModeHandler public: CensorChannel(InspIRCd* Instance) : ModeHandler(Instance, 'G', 0, 0, false, MODETYPE_CHANNEL, false) { } - ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { if (adding) { if (!channel->IsModeSet('G')) { - channel->SetMode('G',false); + channel->SetMode('G',true); return MODEACTION_ALLOW; } } @@ -101,15 +90,15 @@ class ModuleCensor : public Module public: ModuleCensor(InspIRCd* Me) - : Module::Module(Me) + : Module(Me) { /* Read the configuration file on startup. */ - OnRehash(""); + OnRehash(NULL,""); cu = new CensorUser(ServerInstance); cc = new CensorChannel(ServerInstance); - ServerInstance->AddMode(cu, 'G'); - ServerInstance->AddMode(cc, 'G'); + if (!ServerInstance->AddMode(cu) || !ServerInstance->AddMode(cc)) + throw ModuleException("Could not add new modes!"); } void Implements(char* List) @@ -121,17 +110,17 @@ class ModuleCensor : public Module { ServerInstance->Modes->DelMode(cu); ServerInstance->Modes->DelMode(cc); - DELETE(cu); - DELETE(cc); + delete cu; + delete cc; } virtual void ReplaceLine(irc::string &text, irc::string pattern, irc::string replace) { - if ((pattern != "") && (text != "")) + if ((!pattern.empty()) && (!text.empty())) { - while (text.find(pattern) != irc::string::npos) + std::string::size_type pos; + while ((pos = text.find(pattern)) != irc::string::npos) { - int pos = text.find(pattern); text.erase(pos,pattern.length()); text.insert(pos,replace); } @@ -139,41 +128,45 @@ class ModuleCensor : public Module } // format of a config entry is - virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status) + virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) { + if (!IS_LOCAL(user)) + return 0; + bool active = false; + + if (target_type == TYPE_USER) + active = ((User*)dest)->IsModeSet('G'); + else if (target_type == TYPE_CHANNEL) + active = ((Channel*)dest)->IsModeSet('G'); + + if (!active) + return 0; + 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) { - if (target_type == TYPE_USER) + if (index->second.empty()) { - userrec* t = (userrec*)dest; - active = t->IsModeSet('G'); - } - else if (target_type == TYPE_CHANNEL) - { - chanrec* t = (chanrec*)dest; - active = t->IsModeSet('G'); + user->WriteServ("936 %s %s %s :Your message contained a censored word, and was blocked", user->nick, ((Channel*)dest)->name, index->first.c_str()); + return 1; } - if (active) - { - this->ReplaceLine(text2,index->first,index->second); - text = text2.c_str(); - } + 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, char status) + virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) { - return OnUserPreMessage(user,dest,target_type,text,status); + return OnUserPreMessage(user,dest,target_type,text,status,exempt_list); } - virtual void OnRehash(const std::string ¶meter) + virtual void OnRehash(User* user, const std::string ¶meter) { /* * reload our config file on rehash - we must destroy and re-allocate the classes @@ -181,13 +174,15 @@ class ModuleCensor : public Module */ ConfigReader* MyConf = new ConfigReader(ServerInstance); 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(MyConf); + + delete MyConf; } virtual Version GetVersion() @@ -197,28 +192,4 @@ class ModuleCensor : public Module }; -// stuff down here is the module-factory stuff. For basic modules you can ignore this. - -class ModuleCensorFactory : public ModuleFactory -{ - public: - ModuleCensorFactory() - { - } - - ~ModuleCensorFactory() - { - } - - virtual Module * CreateModule(InspIRCd* Me) - { - return new ModuleCensor(Me); - } - -}; - - -extern "C" void * init_module( void ) -{ - return new ModuleCensorFactory; -} +MODULE_INIT(ModuleCensor)