X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_stripcolor.cpp;h=f1504edaf329a6bf270c4441742a7a4eddb7a8bd;hb=bf6c166c6425df40d4d82f3d20719e33ffce4359;hp=e2f7482a9e3913a51742be8038fce507104fe9e0;hpb=8006da76e04591191e6e52826e7af019b5c01f63;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_stripcolor.cpp b/src/modules/m_stripcolor.cpp index e2f7482a9..f1504edaf 100644 --- a/src/modules/m_stripcolor.cpp +++ b/src/modules/m_stripcolor.cpp @@ -1,240 +1,112 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * Copyright (C) 2004, 2008 Craig Edwards + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2007 Robin Burchell * - * This program is free but copyrighted software; see - * the file COPYING for details. + * 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 . */ -#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) */ /** Handles channel mode +S */ -class ChannelStripColor : public ModeHandler +class ChannelStripColor : public SimpleChannelModeHandler { public: - 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) - { - if (adding) - { - if (!channel->IsModeSet('S')) - { - channel->SetMode('S',true); - return MODEACTION_ALLOW; - } - } - else - { - if (channel->IsModeSet('S')) - { - channel->SetMode('S',false); - return MODEACTION_ALLOW; - } - } - - return MODEACTION_DENY; - } + ChannelStripColor(Module* Creator) : SimpleChannelModeHandler(Creator, "stripcolor", 'S') { } }; /** Handles user mode +S */ -class UserStripColor : public ModeHandler +class UserStripColor : public SimpleUserModeHandler { public: - 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) - { - /* Only opers can change other users modes */ - if (source != dest) - return MODEACTION_DENY; - - if (adding) - { - if (!dest->IsModeSet('S')) - { - dest->SetMode('S',true); - return MODEACTION_ALLOW; - } - } - else - { - if (dest->IsModeSet('S')) - { - dest->SetMode('S',false); - return MODEACTION_ALLOW; - } - } - - return MODEACTION_DENY; - } + UserStripColor(Module* Creator) : SimpleUserModeHandler(Creator, "u_stripcolor", 'S') { } }; class ModuleStripColor : public Module { - bool AllowChanOps; - ChannelStripColor *csc; - UserStripColor *usc; - + ChannelStripColor csc; + UserStripColor usc; + public: - ModuleStripColor(InspIRCd* Me) : Module::Module(Me) + ModuleStripColor() : csc(this), usc(this) { - OnRehash(NULL, ""); - - usc = new UserStripColor(ServerInstance); - csc = new ChannelStripColor(ServerInstance); - - if (!ServerInstance->AddMode(usc, 'S') || !ServerInstance->AddMode(csc, 'S')) - throw ModuleException("Could not add new modes!"); } - void Implements(char* List) + void init() { - List[I_OnRehash] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1; + ServerInstance->Modules->AddService(usc); + ServerInstance->Modules->AddService(csc); + Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_On005Numeric }; + ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation)); } virtual ~ModuleStripColor() { - ServerInstance->Modes->DelMode(usc); - ServerInstance->Modes->DelMode(csc); - DELETE(usc); - DELETE(csc); - } - - // ANSI colour stripping based on C example by Doc (Peter Wood) - virtual void ReplaceLine(std::string &sentence) - { - int i, a, len, remove; - len = sentence.length(); - - for (i = 0; i < len; i++) - { - remove = 0; - - switch (sentence[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; - } - - if (remove != 0) - { - len -= remove; - - for (a = i; a <= len; a++) - sentence[a] = sentence[a + remove]; - i--; - } - } } - virtual void OnRehash(userrec* user, const std::string ¶meter) + virtual void On005Numeric(std::string &output) { - ConfigReader Conf(ServerInstance); - - AllowChanOps = Conf.ReadFlag("stripcolor", "allowchanops", 0); + ServerInstance->AddExtBanChar('S'); } - - virtual int OnUserPreMessage(userrec* 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; if (target_type == TYPE_USER) { - userrec* t = (userrec*)dest; + User* t = (User*)dest; active = t->IsModeSet('S'); } else if (target_type == TYPE_CHANNEL) { - chanrec* t = (chanrec*)dest; + Channel* t = (Channel*)dest; + ModResult res = ServerInstance->OnCheckExemption(user,t,"stripcolor"); + + if (res == MOD_RES_ALLOW) + return MOD_RES_PASSTHRU; - // 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 (!AllowChanOps || AllowChanOps && t->GetStatus(user) != STATUS_OP) - active = t->IsModeSet('S'); + active = !t->GetExtBanStatus(user, 'S').check(!t->IsModeSet('S')); } if (active) { - this->ReplaceLine(text); + InspIRCd::StripColor(text); } - return 0; + return MOD_RES_PASSTHRU; } - - virtual int OnUserPreNotice(userrec* 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 Version GetVersion() { - return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); + 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(InspIRCd* Me) - { - return new ModuleStripColor(Me); - } - }; - -extern "C" void * init_module( void ) -{ - return new ModuleStripColorFactory; -} - +MODULE_INIT(ModuleStripColor)