X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_stripcolor.cpp;h=4c5e7c0282641cc018b2176746dcfe0b60ee1774;hb=219993bc9018d9f0d9568330d7a972b68b785d27;hp=ba914c75ef35b3a02bddb28383a360c1ff4a78a8;hpb=28c82e83802100a2b7b6dadf5333a199c9fbe663;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_stripcolor.cpp b/src/modules/m_stripcolor.cpp index ba914c75e..4c5e7c028 100644 --- a/src/modules/m_stripcolor.cpp +++ b/src/modules/m_stripcolor.cpp @@ -2,201 +2,145 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * Inspire is copyright (C) 2002-2004 ChatSpike-Dev. - * E-mail: - * - * - * - * Written by Craig Edwards, Craig McLure, and others. + * 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. + * the file COPYING for details. * * --------------------------------------------------- */ -#include -#include -#include "users.h" -#include "channels.h" -#include "modules.h" +#include "inspircd.h" /* $ModDesc: Provides channel +S mode (strip ansi colour) */ -class ModuleStripColor : public Module +/** Handles channel mode +S + */ +class ChannelStripColor : public SimpleChannelModeHandler { - Server *Srv; - ConfigReader *Conf, *MyConf; - public: - ModuleStripColor() - { - Srv = new Server; + ChannelStripColor(InspIRCd* Instance) : SimpleChannelModeHandler(Instance, 'S') { } +}; - Srv->AddExtendedMode('S',MT_CHANNEL,false,0,0); - Srv->AddExtendedMode('S',MT_CLIENT,false,0,0); - } +/** Handles user mode +S + */ +class UserStripColor : public SimpleUserModeHandler +{ + public: + UserStripColor(InspIRCd* Instance) : SimpleUserModeHandler(Instance, 'S') { } +}; + + +class ModuleStripColor : public Module +{ + bool AllowChanOps; + ChannelStripColor csc; + UserStripColor usc; - virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list ¶ms) + public: + ModuleStripColor(InspIRCd* Me) : Module(Me), csc(Me), usc(Me) { - // check if this is our mode character... - if (modechar == 'S') - { - return 1; - } - else - { - return 0; - } + if (!ServerInstance->Modes->AddMode(&usc) || !ServerInstance->Modes->AddMode(&csc)) + throw ModuleException("Could not add new modes!"); + Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_On005Numeric }; + ServerInstance->Modules->Attach(eventlist, this, 3); } - virtual void On005Numeric(std::string &output) - { - std::stringstream line(output); - std::string temp1, temp2; - while (!line.eof()) - { - line >> temp1; - if (temp1.substr(0,10) == "CHANMODES=") - { - // append the chanmode to the end - temp1 = temp1.substr(10,temp1.length()); - temp1 = "CHANMODES=" + temp1 + "S"; - } - temp2 = temp2 + temp1 + " "; - } - output = temp2.substr(0,temp2.length()-1); - } - virtual ~ModuleStripColor() { - delete Srv; + ServerInstance->Modes->DelMode(&usc); + ServerInstance->Modes->DelMode(&csc); } - - // ANSI colour stripping by Doc (Peter Wood) - virtual void ReplaceLine(std::string &text) - { - int i, a, len, remove; - char sentence[MAXBUF]; - strncpy(sentence,text.c_str(),MAXBUF); - - len = strlen (sentence); - for (i = 0; i < len; i++) - { - remove = 0; + virtual void On005Numeric(std::string &output) + { + ServerInstance->AddExtBanChar('S'); + } - switch (sentence[i]) + virtual void ReplaceLine(std::string &sentence) + { + /* refactor this completely due to SQUIT bug since the old code would strip last char and replace with \0 --peavey */ + int seq = 0; + std::string::iterator i,safei; + for (i = sentence.begin(); i != sentence.end();) + { + if ((*i == 3)) + seq = 1; + else if (seq && (( ((*i >= '0') && (*i <= '9')) || (*i == ',') ) )) { - case 2: - case 15: - case 22: - case 21: - case 31: - remove++; - break; - - case 3: - remove = 1; - - if (isdigit (sentence[i + remove])) - remove++; - - if (isdigit (sentence[i + remove])) - remove++; - - if (sentence[i + remove] == ',') - { - remove += 2; - - if (isdigit (sentence[i + remove])) - remove++; - } - break; + seq++; + if ( (seq <= 4) && (*i == ',') ) + seq = 1; + else if (seq > 3) + seq = 0; } + else + seq = 0; - if (remove != 0) { - len -= remove; - - for (a = i; a <= len; a++) - sentence[a] = sentence[a + remove]; - i--; + if (seq || ((*i == 2) || (*i == 15) || (*i == 22) || (*i == 21) || (*i == 31))) + { + if (i != sentence.begin()) + { + safei = i; + --i; + sentence.erase(safei); + ++i; + } + else + { + sentence.erase(i); + i = sentence.begin(); + } } + else + ++i; } - - text = sentence; } - - virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text) + + 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) { - userrec* t = (userrec*)dest; - active = (strchr(t->modes,'S') > 0); + User* t = (User*)dest; + active = t->IsModeSet('S'); } else if (target_type == TYPE_CHANNEL) { - chanrec* t = (chanrec*)dest; - active = (t->IsCustomModeSet('S')); + Channel* t = (Channel*)dest; + + // check if we allow ops to bypass filtering, if we do, check if they're opped accordingly. + // note: short circut logic here, don't wreck it. -- w00t + if (CHANOPS_EXEMPT(ServerInstance, 'S') && t->GetStatus(user) == STATUS_OP) + { + return 0; + } + + active = t->IsModeSet('S') || t->GetExtBanStatus(user, 'S') < 0; } + if (active) { this->ReplaceLine(text); } + return 0; } - - virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text) + + virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) { - bool active = false; - if (target_type == TYPE_USER) - { - userrec* t = (userrec*)dest; - active = (strchr(t->modes,'S') > 0); - } - else if (target_type == TYPE_CHANNEL) - { - chanrec* t = (chanrec*)dest; - active = (t->IsCustomModeSet('S')); - } - if (active) - { - this->ReplaceLine(text); - } - return 0; + return OnUserPreMessage(user,dest,target_type,text,status,exempt_list); } - + virtual Version GetVersion() { - // This is version 2 because version 1.x is the unreleased unrealircd module - return Version(1,0,0,0); + 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 ModuleStripColorFactory : public ModuleFactory -{ - public: - ModuleStripColorFactory() - { - } - - ~ModuleStripColorFactory() - { - } - - virtual Module * CreateModule() - { - return new ModuleStripColor; - } - }; - -extern "C" void * init_module( void ) -{ - return new ModuleStripColorFactory; -} - +MODULE_INIT(ModuleStripColor)