X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_stripcolor.cpp;h=86f307bae2ed4e494bccb87555cf75ef3f2f6e1e;hb=97e8518c1961c3d1ff7b3a0ad4e04ee2880c1fc4;hp=d51e7ca59ced00d10838dd7cff9b00250220e233;hpb=1bc39e97ccdbfd84e533d6dc6bf266102a4060bd;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_stripcolor.cpp b/src/modules/m_stripcolor.cpp index d51e7ca59..86f307bae 100644 --- a/src/modules/m_stripcolor.cpp +++ b/src/modules/m_stripcolor.cpp @@ -1,197 +1,140 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * - * - * Written by Craig Edwards, Craig McLure, and others. - * This program is free but copyrighted software; see - * the file COPYING for details. + * Copyright (C) 2004, 2008 Craig Edwards + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2007 Robin Burchell * - * --------------------------------------------------- + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ -using namespace std; -#include -#include -#include "users.h" -#include "channels.h" -#include "modules.h" +#include "inspircd.h" -/* $ModDesc: Provides channel +S mode (strip ansi colour) */ +/* $ModDesc: Provides channel +S mode (strip ansi color) */ -class ModuleStripColor : public Module +/** Handles channel mode +S + */ +class ChannelStripColor : public SimpleChannelModeHandler { - Server *Srv; - ConfigReader *Conf, *MyConf; - public: - ModuleStripColor(Server* Me) - : Module::Module(Me) - { - Srv = Me; + ChannelStripColor(Module* Creator) : SimpleChannelModeHandler(Creator, "stripcolor", '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(Module* Creator) : SimpleUserModeHandler(Creator, "u_stripcolor", 'S') { } +}; + + +class ModuleStripColor : public Module +{ + bool AllowChanOps; + ChannelStripColor csc; + UserStripColor usc; - void Implements(char* List) + public: + ModuleStripColor() : csc(this), usc(this) { - List[I_OnExtendedMode] = List[I_On005Numeric] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1; } - virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list ¶ms) + void init() { - // check if this is our mode character... - if (modechar == 'S') - { - return 1; - } - else - { - return 0; - } + ServerInstance->Modules->AddService(usc); + ServerInstance->Modules->AddService(csc); + Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_On005Numeric }; + ServerInstance->Modules->Attach(eventlist, this, 3); } - virtual void On005Numeric(std::string &output) - { - InsertMode(output,"S",4); - } - virtual ~ModuleStripColor() { } - - // ANSI colour stripping by Doc (Peter Wood) - virtual void ReplaceLine(std::string &text) + + virtual void On005Numeric(std::string &output) { - int i, a, len, remove; - char sentence[MAXBUF]; - strlcpy(sentence,text.c_str(),MAXBUF); - - len = strlen(sentence); + ServerInstance->AddExtBanChar('S'); + } - for (i = 0; i < len; i++) - { - remove = 0; + 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; - switch (sentence[i]) + for (std::string::iterator 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))) + i = sentence.erase(i); + else + ++i; } - - text = sentence; } - - virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text) + + virtual ModResult OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) { + if (!IS_LOCAL(user)) + return MOD_RES_PASSTHRU; + 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; + ModResult res = ServerInstance->OnCheckExemption(user,t,"stripcolor"); + + if (res == MOD_RES_ALLOW) + return MOD_RES_PASSTHRU; + + active = !t->GetExtBanStatus(user, 'S').check(!t->IsModeSet('S')); } + if (active) { this->ReplaceLine(text); } - return 0; + + return MOD_RES_PASSTHRU; } - - virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text) + + virtual ModResult 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,VF_STATIC|VF_VENDOR); + return Version("Provides channel +S mode (strip ansi color)", VF_VENDOR); } - -}; -// 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)