X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_stripcolor.cpp;h=39ba84b9a47537b2c59fa30b992c6e273d7ac988;hb=52671661f8fdca0b61aec8009b4bc7de9bc00166;hp=6015005867441596c8b8aee046676aea7a31cb16;hpb=f9900a3e43840feebfb86ac3f2e6d32058dfa36a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_stripcolor.cpp b/src/modules/m_stripcolor.cpp index 601500586..39ba84b9a 100644 --- a/src/modules/m_stripcolor.cpp +++ b/src/modules/m_stripcolor.cpp @@ -2,40 +2,28 @@ * | 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-2008 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. + * the file COPYING for details. * * --------------------------------------------------- */ -using namespace std; - -#include -#include -#include "users.h" -#include "channels.h" -#include "modules.h" -#include "helperfuncs.h" +#include "inspircd.h" /* $ModDesc: Provides channel +S mode (strip ansi colour) */ +/** Handles channel mode +S + */ class ChannelStripColor : public ModeHandler { public: - StripColor() : ModeHandler('S', 0, 0, false, MODETYPE_CHANNEL, false) { } + ChannelStripColor(InspIRCd* Instance) : ModeHandler(Instance, 'S', 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, bool servermode) { - /* Only opers can change other users modes */ - if ((source != dest) && (!*source->oper)) - return MODEACTION_DENY; - if (adding) { if (!channel->IsModeSet('S')) @@ -57,15 +45,17 @@ class ChannelStripColor : public ModeHandler } }; +/** Handles user mode +S + */ class UserStripColor : public ModeHandler { public: - StripColor() : ModeHandler('S', 0, 0, false, MODETYPE_USER, false) { } + UserStripColor(InspIRCd* Instance) : ModeHandler(Instance, 'S', 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, bool servermode) { /* Only opers can change other users modes */ - if ((source != dest) && (!*source->oper)) + if (source != dest) return MODEACTION_DENY; if (adding) @@ -92,151 +82,103 @@ class UserStripColor : public ModeHandler class ModuleStripColor : public Module { - Server *Srv; - ConfigReader *Conf, *MyConf; - ChannelStripColor *csc; - UserStripColor *usc; + bool AllowChanOps; + ChannelStripColor *csc; + UserStripColor *usc; public: - ModuleStripColor(Server* Me) - : Module::Module(Me) + ModuleStripColor(InspIRCd* Me) : Module(Me) { - Srv = Me; - - usc = new UserStripColor(); - csc = new ChannelStripColor(); + usc = new UserStripColor(ServerInstance); + csc = new ChannelStripColor(ServerInstance); - Srv->AddMode(usc, 'S'); - Srv->AddMode(csc, 'S'); + if (!ServerInstance->Modes->AddMode(usc) || !ServerInstance->Modes->AddMode(csc)) + throw ModuleException("Could not add new modes!"); + Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice }; + ServerInstance->Modules->Attach(eventlist, this, 2); } - void Implements(char* List) - { - List[I_On005Numeric] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1; - } - virtual void On005Numeric(std::string &output) - { - InsertMode(output,"S",4); - } - virtual ~ModuleStripColor() { - DELETE(usc); - DELETE(csc); + ServerInstance->Modes->DelMode(usc); + ServerInstance->Modes->DelMode(csc); + delete usc; + delete csc; } - // ANSI colour stripping by Doc (Peter Wood) - virtual void ReplaceLine(std::string &text) + virtual void ReplaceLine(std::string &sentence) { - int i, a, len, remove; - char sentence[MAXBUF]; - strlcpy(sentence,text.c_str(),MAXBUF); - - len = text.length(); - - for (i = 0; i < len; i++) - { - remove = 0; - - switch (sentence[i]) + /* 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(); ++i) + { + 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; } - - if (remove != 0) + else + seq = 0; + + if (seq || ((*i == 2) || (*i == 15) || (*i == 22) || (*i == 21) || (*i == 31))) { - len -= remove; - - for (a = i; a <= len; a++) - sentence[a] = sentence[a + remove]; - i--; + safei = i; + --i; + sentence.erase(safei); } } - - text = sentence; } - - 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) { - userrec* t = (userrec*)dest; - active = t->modes['S'-65]; + User* t = (User*)dest; + active = t->IsModeSet('S'); } else if (target_type == TYPE_CHANNEL) { - chanrec* t = (chanrec*)dest; - active = (t->IsModeSet('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'); } + if (active) { this->ReplaceLine(text); } + 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 Version GetVersion() { - // This is version 2 because version 1.x is the unreleased unrealircd module - return Version(1,0,0,0,VF_STATIC|VF_VENDOR); + return Version(1, 2, 0, 0, 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(Server* Me) - { - return new ModuleStripColor(Me); - } - -}; - - -extern "C" void * init_module( void ) -{ - return new ModuleStripColorFactory; -} - +MODULE_INIT(ModuleStripColor)