X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_censor.cpp;h=e561b80a1c063788cbaddaf118fce98cb14184ec;hb=be609949e3ec2543d6cb16d23240870028732f36;hp=0930c1d45660763c9a90dfba52e25de2b011985d;hpb=42d5b9571eff06b0c33093dc9118c29f9603fd2b;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_censor.cpp b/src/modules/m_censor.cpp index 0930c1d45..e561b80a1 100644 --- a/src/modules/m_censor.cpp +++ b/src/modules/m_censor.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * InspIRCd: (C) 2002-2008 InspIRCd Development Team * See: http://www.inspircd.org/wiki/index.php/Credits * * This program is free but copyrighted software; see @@ -11,11 +11,9 @@ * --------------------------------------------------- */ -#include -#include -#include "users.h" -#include "channels.h" -#include "modules.h" +#define _CRT_SECURE_NO_DEPRECATE +#define _SCL_SECURE_NO_DEPRECATE + #include "inspircd.h" typedef std::map censor_t; @@ -24,96 +22,52 @@ typedef std::map censor_t; /** Handles usermode +G */ -class CensorUser : public ModeHandler +class CensorUser : public SimpleUserModeHandler { 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) - { - 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; - } + CensorUser(InspIRCd* Instance) : SimpleUserModeHandler(Instance, 'G') { } }; /** Handles channel mode +G */ -class CensorChannel : public ModeHandler +class CensorChannel : public SimpleChannelModeHandler { 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) - { - if (adding) - { - if (!channel->IsModeSet('G')) - { - channel->SetMode('G',true); - return MODEACTION_ALLOW; - } - } - else - { - if (channel->IsModeSet('G')) - { - channel->SetMode('G',false); - return MODEACTION_ALLOW; - } - } - - return MODEACTION_ALLOW; - } + CensorChannel(InspIRCd* Instance) : SimpleChannelModeHandler(Instance, 'G') { } }; class ModuleCensor : public Module { - - censor_t censors; CensorUser *cu; CensorChannel *cc; - + public: ModuleCensor(InspIRCd* Me) - : Module::Module(Me) + : Module(Me) { /* Read the configuration file on startup. */ OnRehash(NULL,""); cu = new CensorUser(ServerInstance); cc = new CensorChannel(ServerInstance); - if (!ServerInstance->AddMode(cu, 'G') || !ServerInstance->AddMode(cc, 'G')) + if (!ServerInstance->Modes->AddMode(cu) || !ServerInstance->Modes->AddMode(cc)) + { + delete cu; + delete cc; throw ModuleException("Could not add new modes!"); + } + Implementation eventlist[] = { I_OnRehash, I_OnUserPreMessage, I_OnUserPreNotice }; + ServerInstance->Modules->Attach(eventlist, this, 3); } - void Implements(char* List) - { - List[I_OnRehash] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1; - } virtual ~ModuleCensor() { 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) @@ -130,36 +84,52 @@ 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, CUList &exempt_list) + 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 = ((userrec*)dest)->IsModeSet('G'); + active = ((User*)dest)->IsModeSet('G'); else if (target_type == TYPE_CHANNEL) - active = ((chanrec*)dest)->IsModeSet('G'); + { + active = ((Channel*)dest)->IsModeSet('G'); + Channel* c = (Channel*)dest; + if (CHANOPS_EXEMPT(ServerInstance, 'G') && c->GetStatus(user) == STATUS_OP) + { + return 0; + } + } 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 (index->second.empty()) + { + user->WriteNumeric(ERR_WORDFILTERED, "%s %s %s :Your message contained a censored word, and was blocked", user->nick.c_str(), ((Channel*)dest)->name.c_str(), index->first.c_str()); + return 1; + } + 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, CUList &exempt_list) + + 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,exempt_list); } - - virtual void OnRehash(userrec* user, 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 @@ -167,44 +137,22 @@ 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() { - return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION); + return Version("$Id$",VF_COMMON|VF_VENDOR,API_VERSION); } - -}; - -// 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)