X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_censor.cpp;h=62d7a54d0b676519c9c8032ca49b0736f2c303c6;hb=9336468f5bfa60318cb57db5126047147b7a21cb;hp=c980a1f454eaa67a7418c6d3f075b139d60f442b;hpb=267634cc1a5700787b53d0f8421aed63d08f7773;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_censor.cpp b/src/modules/m_censor.cpp index c980a1f45..62d7a54d0 100644 --- a/src/modules/m_censor.cpp +++ b/src/modules/m_censor.cpp @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -26,7 +26,7 @@ typedef std::map censor_t; class CensorUser : public SimpleUserModeHandler { public: - CensorUser(InspIRCd* Instance) : SimpleUserModeHandler(Instance, 'G') { } + CensorUser(Module* Creator) : SimpleUserModeHandler(Creator, 'G') { } }; /** Handles channel mode +G @@ -34,30 +34,24 @@ class CensorUser : public SimpleUserModeHandler class CensorChannel : public SimpleChannelModeHandler { public: - CensorChannel(InspIRCd* Instance) : SimpleChannelModeHandler(Instance, 'G') { } + CensorChannel(Module* Creator) : SimpleChannelModeHandler(Creator, 'G') { } }; class ModuleCensor : public Module { censor_t censors; - CensorUser *cu; - CensorChannel *cc; + CensorUser cu; + CensorChannel cc; public: - ModuleCensor(InspIRCd* Me) - : Module(Me) + ModuleCensor() + : cu(this), cc(this) { /* Read the configuration file on startup. */ - OnRehash(NULL,""); - cu = new CensorUser(ServerInstance); - cc = new CensorChannel(ServerInstance); - if (!ServerInstance->Modes->AddMode(cu) || !ServerInstance->Modes->AddMode(cc)) - { - delete cu; - delete cc; + OnRehash(NULL); + if (!ServerInstance->Modes->AddMode(&cu) || !ServerInstance->Modes->AddMode(&cc)) throw ModuleException("Could not add new modes!"); - } Implementation eventlist[] = { I_OnRehash, I_OnUserPreMessage, I_OnUserPreNotice, I_OnRunTestSuite }; ServerInstance->Modules->Attach(eventlist, this, 4); } @@ -65,60 +59,13 @@ class ModuleCensor : public Module virtual ~ModuleCensor() { - ServerInstance->Modes->DelMode(cu); - ServerInstance->Modes->DelMode(cc); - delete cu; - delete cc; - } - - virtual void OnRunTestSuite() - { - std::cout << "Test suite for m_censor:" << std::endl; - - irc::string text = "original text"; - irc::string pattern = "text"; - irc::string replace = "new"; - std::cout << (ReplaceLine(text, pattern, replace) == "original new" ? "\nSUCCESS!\n" : "\nFAILURE '" + text + "' \n"); - text = "original text here"; - pattern = "text"; - replace = "texts"; - std::cout << (ReplaceLine(text, pattern, replace) == "original texts here" ? "\nSUCCESS!\n" : "\nFAILURE: '" + text + "' \n"); - text = "original text"; - pattern = "original"; - replace = "new"; - std::cout << (ReplaceLine(text, pattern, replace) == "new text" ? "\nSUCCESS!\n" : "\nFAILURE '" + text + "' \n"); - std::cout << "end of test suite for m_censor" << std::endl; - } - - /* This version of ReplaceLine won't loop forever if the replacement string contains the source pattern */ - virtual const irc::string& ReplaceLine(irc::string &text, irc::string pattern, irc::string replace) - { - irc::string replacement; - if ((!pattern.empty()) && (!text.empty())) - { - for (std::string::size_type n = 0; n != text.length(); ++n) - { - if (text.length() >= pattern.length() && text.substr(n, pattern.length()) == pattern) - { - /* Found the pattern in the text, replace it, and advance */ - replacement.append(replace); - n = n + pattern.length() - 1; - } - else - { - replacement += text[n]; - } - } - } - text = replacement; - return text; } // format of a config entry is - virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) + virtual ModResult OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) { if (!IS_LOCAL(user)) - return 0; + return MOD_RES_PASSTHRU; bool active = false; @@ -128,14 +75,14 @@ class ModuleCensor : public Module { active = ((Channel*)dest)->IsModeSet('G'); Channel* c = (Channel*)dest; - if (CHANOPS_EXEMPT(ServerInstance, 'G') && c->GetStatus(user) == STATUS_OP) + if (CHANOPS_EXEMPT('G') && c->GetPrefixValue(user) == OP_VALUE) { - return 0; + return MOD_RES_PASSTHRU; } } if (!active) - return 0; + return MOD_RES_PASSTHRU; irc::string text2 = text.c_str(); for (censor_t::iterator index = censors.begin(); index != censors.end(); index++) @@ -145,28 +92,28 @@ class ModuleCensor : public Module 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; + return MOD_RES_DENY; } - this->ReplaceLine(text2,index->first,index->second); + SearchAndReplace(text2, index->first, index->second); } } text = text2.c_str(); - return 0; + return MOD_RES_PASSTHRU; } - virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) + virtual ModResult 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(User* user, const std::string ¶meter) + virtual void OnRehash(User* user) { /* * reload our config file on rehash - we must destroy and re-allocate the classes * to call the constructor again and re-read our data. */ - ConfigReader* MyConf = new ConfigReader(ServerInstance); + ConfigReader* MyConf = new ConfigReader; censors.clear(); for (int index = 0; index < MyConf->Enumerate("badword"); index++) @@ -181,7 +128,7 @@ class ModuleCensor : public Module virtual Version GetVersion() { - return Version("$Id$",VF_COMMON|VF_VENDOR,API_VERSION); + return Version("Provides user and channel +G mode",VF_COMMON|VF_VENDOR,API_VERSION); } };